summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorF. Duncan M. Haldane <haldane@Princeton.EDU>2008-11-07 18:17:51 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-06 13:51:38 -0800
commit6e38a2ba79b85966fc09df3eb8f502df5df60c09 (patch)
tree61aec342fda3e98ee35386f2a3f183c54959db4a
parent60572c0d8b8a5164445b3ebcaa0b15f7935f321a (diff)
downloadblackbird-op-linux-6e38a2ba79b85966fc09df3eb8f502df5df60c09.tar.gz
blackbird-op-linux-6e38a2ba79b85966fc09df3eb8f502df5df60c09.zip
Staging: Kconfig for ARCH=arm,8300, cris
The new Kconfig option to build "staging" drivers (code in drivers/staging/) is seen in all except three architectures (arm, h8300, cris), because in these cases arch/$ARCH/Kconfig does NOT source drivers/Kconfig. This patch adds the source "drivers/staging/Kconfig" to arch/$ARCH/Kconfig for these three exceptional cases. Signed-off-by: Duncan Haldane <duncan_h@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--arch/arm/Kconfig2
-rw-r--r--arch/cris/Kconfig2
-rw-r--r--arch/h8300/Kconfig2
3 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index d6ebe39934b5..dbfdf87f993f 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1325,6 +1325,8 @@ source "drivers/regulator/Kconfig"
source "drivers/uio/Kconfig"
+source "drivers/staging/Kconfig"
+
endmenu
source "fs/Kconfig"
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index b17aeea8d620..3462245fe9fb 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -681,6 +681,8 @@ source "drivers/usb/Kconfig"
source "drivers/uwb/Kconfig"
+source "drivers/staging/Kconfig"
+
source "arch/cris/Kconfig.debug"
source "security/Kconfig"
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 28f06fd9b7b7..9420648352b8 100644
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -220,6 +220,8 @@ source "drivers/uwb/Kconfig"
endmenu
+source "drivers/staging/Kconfig"
+
source "fs/Kconfig"
source "arch/h8300/Kconfig.debug"
OpenPOWER on IntegriCloud