The patch titled CRIS: avoid using arch links in Kconfig has been added to the -mm tree. Its filename is cris-avoid-using-arch-links-in-kconfig.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: CRIS: avoid using arch links in Kconfig From: Jesper Nilsson <jesper.nilsson@xxxxxxxx> 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@xxxxxxxx> Acked-by: Sam Ravnborg <sam@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/cris/Kconfig | 5 +++-- arch/cris/arch-v10/Kconfig | 4 ++++ arch/cris/arch-v10/drivers/Kconfig | 4 ++++ arch/cris/arch-v32/Kconfig | 4 ++++ arch/cris/arch-v32/drivers/Kconfig | 4 ++++ 5 files changed, 19 insertions(+), 2 deletions(-) diff -puN arch/cris/Kconfig~cris-avoid-using-arch-links-in-kconfig arch/cris/Kconfig --- a/arch/cris/Kconfig~cris-avoid-using-arch-links-in-kconfig +++ a/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 diff -puN arch/cris/arch-v10/Kconfig~cris-avoid-using-arch-links-in-kconfig arch/cris/arch-v10/Kconfig --- a/arch/cris/arch-v10/Kconfig~cris-avoid-using-arch-links-in-kconfig +++ a/arch/cris/arch-v10/Kconfig @@ -1,3 +1,5 @@ +if ETRAX_ARCH_V10 + # ETRAX 100LX v1 has a MMU "feature" requiring a low mapping config CRIS_LOW_MAP bool @@ -451,3 +453,5 @@ config ETRAX_POWERBUTTON_BIT default "25" help Configure where power button is connected. + +endif diff -puN arch/cris/arch-v10/drivers/Kconfig~cris-avoid-using-arch-links-in-kconfig arch/cris/arch-v10/drivers/Kconfig --- a/arch/cris/arch-v10/drivers/Kconfig~cris-avoid-using-arch-links-in-kconfig +++ a/arch/cris/arch-v10/drivers/Kconfig @@ -1,3 +1,5 @@ +if ETRAX_ARCH_V10 + config ETRAX_ETHERNET bool "Ethernet support" depends on ETRAX_ARCH_V10 @@ -806,3 +808,5 @@ config ETRAX_DS1302_TRICKLE_CHARGE 1 = 2kohm, 2 = 4kohm, 3 = 4kohm 4 = 1 diode, 8 = 2 diodes Allowed values are (increasing current): 0, 11, 10, 9, 7, 6, 5 + +endif diff -puN arch/cris/arch-v32/Kconfig~cris-avoid-using-arch-links-in-kconfig arch/cris/arch-v32/Kconfig --- a/arch/cris/arch-v32/Kconfig~cris-avoid-using-arch-links-in-kconfig +++ a/arch/cris/arch-v32/Kconfig @@ -1,3 +1,5 @@ +if ETRAX_ARCH_V32 + config ETRAX_DRAM_VIRTUAL_BASE hex depends on ETRAX_ARCH_V32 @@ -294,3 +296,5 @@ config ETRAX_DEF_GIO_PE_OUT help Configures the initial data for the general port E bits. Most products should use 00000 here. + +endif diff -puN arch/cris/arch-v32/drivers/Kconfig~cris-avoid-using-arch-links-in-kconfig arch/cris/arch-v32/drivers/Kconfig --- a/arch/cris/arch-v32/drivers/Kconfig~cris-avoid-using-arch-links-in-kconfig +++ a/arch/cris/arch-v32/drivers/Kconfig @@ -1,3 +1,5 @@ +if ETRAX_ARCH_V32 + config ETRAX_ETHERNET bool "Ethernet support" depends on ETRAX_ARCH_V32 @@ -610,3 +612,5 @@ config ETRAX_STREAMCOPROC help This option enables a driver for the stream co-processor for cryptographic operations. + +endif _ Patches currently in -mm which might be from jesper.nilsson@xxxxxxxx are cris-build-fixes-atomich-needs-compilerh.patch git-mtd.patch cris-avoid-using-arch-links-in-kconfig.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html