Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/staging/cpc-usb/TODO
	drivers/staging/cpc-usb/cpc-usb_drv.c
	drivers/staging/cpc-usb/cpc.h
	drivers/staging/cpc-usb/cpc_int.h
	drivers/staging/cpc-usb/cpcusb.h

1 files changed, 21 insertions, 0 deletions

diff --git a/arch/arm/mach-bcmring/Kconfig b/arch/arm/mach-bcmring/Kconfig
new file mode 100644
index 000000000000..457b4384913e
--- /dev/null
+++ b/arch/arm/mach-bcmring/Kconfig
@@ -0,0 +1,21 @@
+choice
+        prompt "Processor selection in BCMRING family of devices"
+        depends on ARCH_BCMRING
+        default ARCH_BCM11107
+
+config ARCH_FPGA11107
+        bool "FPGA11107"
+
+config ARCH_BCM11107
+        bool "BCM11107"
+endchoice
+
+menu "BCMRING Options"
+        depends on ARCH_BCMRING
+
+config BCM_ZRELADDR
+        hex "Compressed ZREL ADDR"
+
+endmenu
+
+# source "drivers/char/bcmring/Kconfig"