---

yaml --- r: 267022 b: refs/heads/master c: 393daa8 h: refs/heads/master v: v3
git-mirror · Oct 13, 2011 · 7887074 · 7887074
1 parent 8ee814f
commit 7887074
Show file tree

Hide file tree

Showing 4 changed files with 1,224 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98da3529536ed3c78ae493f4cc3d7ac8d43fc72c
+refs/heads/master: 393daa814f4bbc6f5c099178c073fae9f7ef6177
diff --git a/trunk/drivers/pinctrl/Kconfig b/trunk/drivers/pinctrl/Kconfig
@@ -26,6 +26,13 @@ config DEBUG_PINCTRL
 	help
 	  Say Y here to add some extra checks and diagnostics to PINCTRL calls.
 
+config PINMUX_SIRF
+	bool "CSR SiRFprimaII pinmux driver"
+	depends on ARCH_PRIMA2
+	select PINMUX
+	help
+	  Say Y here to enable the SiRFprimaII pinmux driver
+
 config PINMUX_U300
 	bool "U300 pinmux driver"
 	depends on ARCH_U300

diff --git a/trunk/drivers/pinctrl/Makefile b/trunk/drivers/pinctrl/Makefile
@@ -4,4 +4,5 @@ ccflags-$(CONFIG_DEBUG_PINMUX)	+= -DDEBUG
 
 obj-$(CONFIG_PINCTRL)		+= core.o
 obj-$(CONFIG_PINMUX)		+= pinmux.o
+obj-$(CONFIG_PINMUX_SIRF)	+= pinmux-sirf.o
 obj-$(CONFIG_PINMUX_U300)	+= pinmux-u300.o