From: Juha Yrjölä Date: Tue, 27 Feb 2007 10:13:32 +0000 (-0800) Subject: Add CBUS support X-Git-Tag: v2.6.21-omap1~109^2~3 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27f29222f580a18a82cd10730f3a2ccedf963bed;p=pandora-kernel.git Add CBUS support CBUS is the bus that Energy Management ASICs are connected to on some Nokia mobile devices. Added support for CBUS and two EM ASIC drivers. Also added board config structures for some of the Nokia 770 drivers. Signed-off-by: Juha Yrjölä --- diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ac2ffdcfbbb4..d25cfb07ab05 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -988,6 +988,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 3a718f51350e..41c2096ffeac 100644 --- 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/ Reading git-diff-tree failed