summaryrefslogtreecommitdiffstats
path: root/arch/cris/Kconfig
diff options
context:
space:
mode:
authorJesper Nilsson2008-02-05 07:30:31 +0100
committerLinus Torvalds2008-02-05 18:44:24 +0100
commit2d33d563b1e2b4748c585e3169f46481e897c829 (patch)
tree843218ff514dea2f8a33aceafa82495fbcfdbfc4 /arch/cris/Kconfig
parentmac68k: remove dead MAC_ADBKEYCODES (diff)
downloadkernel-qcow2-linux-2d33d563b1e2b4748c585e3169f46481e897c829.tar.gz
kernel-qcow2-linux-2d33d563b1e2b4748c585e3169f46481e897c829.tar.xz
kernel-qcow2-linux-2d33d563b1e2b4748c585e3169f46481e897c829.zip
CRIS: avoid using arch links in Kconfig
Improve including of architecture dependent Kconfig files. - Always include the architecture dependent Kconfig files. - Wrap architecture dependent Kconfig files inside an appropriate "if ETRAX_ARCH_Vxx" block. This makes it possible to run the configuration even without the arch links, which are created later in the build process. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com> Acked-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/cris/Kconfig')
-rw-r--r--arch/cris/Kconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 7f0be4cd5e9a..27b082ac7f11 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -150,6 +150,7 @@ config ETRAX_FLASH_BUSWIDTH
Width in bytes of the Flash bus (1, 2 or 4). Is usually 2.
source arch/cris/arch-v10/Kconfig
+source arch/cris/arch-v32/Kconfig
endmenu
@@ -157,8 +158,8 @@ source "net/Kconfig"
# bring in ETRAX built-in drivers
menu "Drivers for built-in interfaces"
-# arch/cris/arch is a symlink to correct arch (arch-v10 or arch-v32)
-source arch/cris/arch/drivers/Kconfig
+source arch/cris/arch-v10/drivers/Kconfig
+source arch/cris/arch-v32/drivers/Kconfig
endmenu