Add Nokia CBUS support

Add Nokia CBUS support

Signed-off-by: Juha Yrjola <juha.yrjola@solidboot.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index af74719..07c57f9 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1037,6 +1037,10 @@ source "drivers/mmc/Kconfig"
 
 source "drivers/rtc/Kconfig"
 
+if ARCH_OMAP
+source "drivers/cbus/Kconfig"
+endif
+
 endmenu
 
 source "fs/Kconfig"

diff --git a/drivers/Makefile b/drivers/Makefile
index adad2f3..e22d0c2 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -27,7 +27,7 @@ obj-$(CONFIG_FB_INTEL)          += video/intelfb/
 
 obj-y                          += serial/
 obj-$(CONFIG_PARPORT)          += parport/
-obj-y                          += base/ block/ misc/ mfd/ net/ media/
+obj-y                          += base/ block/ misc/ mfd/ net/ media/ cbus/
 obj-$(CONFIG_NUBUS)            += nubus/
 obj-$(CONFIG_ATM)              += atm/
 obj-y                          += macintosh/

diff --cc drivers/cbus/Kconfig
Simple merge

diff --cc drivers/cbus/Makefile
Simple merge

diff --cc drivers/cbus/cbus.c
Simple merge

diff --cc drivers/cbus/cbus.h
Simple merge

diff --cc drivers/cbus/retu-headset.c
Simple merge

diff --cc drivers/cbus/retu-pwrbutton.c
Simple merge

diff --cc drivers/cbus/retu-rtc.c
Simple merge

diff --cc drivers/cbus/retu-user.c
Simple merge

diff --cc drivers/cbus/retu-wdt.c
Simple merge

diff --cc drivers/cbus/retu.c
Simple merge

diff --cc drivers/cbus/retu.h
Simple merge

diff --cc drivers/cbus/tahvo-usb.c
Simple merge

diff --cc drivers/cbus/tahvo-user.c
Simple merge

diff --cc drivers/cbus/tahvo.c
Simple merge

diff --cc drivers/cbus/tahvo.h
Simple merge

diff --cc drivers/cbus/user_retu_tahvo.h
Simple merge