2 files changed, 18 insertions, 15 deletions

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 5ea169362164..3788a548336c 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -23,9 +23,20 @@ config MTD_PHYSMAP
           To compile this driver as a module, choose M here: the
           module will be called physmap.
 
+config MTD_PHYSMAP_COMPAT
+        bool "Physmap compat support"
+        depends on MTD_PHYSMAP
+        default n
+        help
+          Setup a simple mapping via the Kconfig options.  Normally the
+          physmap configuration options are done via your board's
+          resource file.
+
+          If unsure, say N here.
+
 config MTD_PHYSMAP_START
         hex "Physical start address of flash mapping"
-        depends on MTD_PHYSMAP
+        depends on MTD_PHYSMAP_COMPAT
         default "0x8000000"
         help
           This is the physical memory location at which the flash chips
@@ -37,7 +48,7 @@ config MTD_PHYSMAP_START
 
 config MTD_PHYSMAP_LEN
         hex "Physical length of flash mapping"
-        depends on MTD_PHYSMAP
+        depends on MTD_PHYSMAP_COMPAT
         default "0"
         help
           This is the total length of the mapping of the flash chips on
@@ -51,7 +62,7 @@ config MTD_PHYSMAP_LEN
 
 config MTD_PHYSMAP_BANKWIDTH
         int "Bank width in octets"
-        depends on MTD_PHYSMAP
+        depends on MTD_PHYSMAP_COMPAT
         default "2"
         help
           This is the total width of the data bus of the flash devices
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index dfbf3f270cea..876dfab92847 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -251,14 +251,7 @@ static struct platform_driver physmap_flash_driver = {
 };
 
 
-#ifdef CONFIG_MTD_PHYSMAP_LEN
-#if CONFIG_MTD_PHYSMAP_LEN != 0
-#warning using PHYSMAP compat code
-#define PHYSMAP_COMPAT
-#endif
-#endif
-
-#ifdef PHYSMAP_COMPAT
+#ifdef CONFIG_MTD_PHYSMAP_COMPAT
 static struct physmap_flash_data physmap_flash_data = {
         .width          = CONFIG_MTD_PHYSMAP_BANKWIDTH,
 };
@@ -302,7 +295,7 @@ static int __init physmap_init(void)
         int err;
 
         err = platform_driver_register(&physmap_flash_driver);
-#ifdef PHYSMAP_COMPAT
+#ifdef CONFIG_MTD_PHYSMAP_COMPAT
         if (err == 0)
                 platform_device_register(&physmap_flash);
 #endif
@@ -312,7 +305,7 @@ static int __init physmap_init(void)
 
 static void __exit physmap_exit(void)
 {
-#ifdef PHYSMAP_COMPAT
+#ifdef CONFIG_MTD_PHYSMAP_COMPAT
         platform_device_unregister(&physmap_flash);
 #endif
         platform_driver_unregister(&physmap_flash_driver);
@@ -326,8 +319,7 @@ MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>");
 MODULE_DESCRIPTION("Generic configurable MTD map driver");
 
 /* legacy platform drivers can't hotplug or coldplg */
-#ifndef PHYSMAP_COMPAT
+#ifndef CONFIG_MTD_PHYSMAP_COMPAT
 /* work with hotplug and coldplug */
 MODULE_ALIAS("platform:physmap-flash");
 #endif
-