Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify

[karo-tx-linux.git] / arch / blackfin / Kconfig

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index dd5970dfa696989822538cffe165d1f537f13194..0a221d48152dd6f116cb8938770d5fd0e5639968 100644 (file)
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -1,10 +1,3 @@
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
-
-mainmenu "Blackfin Kernel Configuration"
-
 config SYMBOL_PREFIX
        string
        default "_"
@@ -928,6 +921,12 @@ config ROMKERNEL
 
 endchoice
 
+# Common code uses "ROMKERNEL" or "XIP_KERNEL", so define both
+config XIP_KERNEL
+       bool
+       default y
+       depends on ROMKERNEL
+
 source "mm/Kconfig"
 
 config BFIN_GPTIMERS