From 5c331adc733f1f34a29d7dbda2fa257a15df8b7d Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Tue, 25 Oct 2011 11:00:07 +0200 Subject: [PATCH] --- yaml --- r: 274971 b: refs/heads/master c: 6be55f79a216ccb9f364476b12e5b151a5f6bdb6 h: refs/heads/master i: 274969: 2d574edec72448409bf74f86966c987e13fdb936 274967: 2515f7f352ab11748a154d191dfbbcd241ff6ee9 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/devices/Kconfig | 3 +-- trunk/drivers/mtd/devices/docprobe.c | 5 ----- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 019d1c5bfcac..ae8255c05ef4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 123005f3ccfa58637ad6e1a8b9f7f3f861ca65f4 +refs/heads/master: 6be55f79a216ccb9f364476b12e5b151a5f6bdb6 diff --git a/trunk/drivers/mtd/devices/Kconfig b/trunk/drivers/mtd/devices/Kconfig index 6d91a1f049c8..283d887f7825 100644 --- a/trunk/drivers/mtd/devices/Kconfig +++ b/trunk/drivers/mtd/devices/Kconfig @@ -278,8 +278,7 @@ config MTD_DOCPROBE_ADVANCED config MTD_DOCPROBE_ADDRESS hex "Physical address of DiskOnChip" if MTD_DOCPROBE_ADVANCED depends on MTD_DOCPROBE - default "0x0000" if MTD_DOCPROBE_ADVANCED - default "0" if !MTD_DOCPROBE_ADVANCED + default "0x0" ---help--- By default, the probe for DiskOnChip devices will look for a DiskOnChip at every multiple of 0x2000 between 0xC8000 and 0xEE000. diff --git a/trunk/drivers/mtd/devices/docprobe.c b/trunk/drivers/mtd/devices/docprobe.c index d374603493a7..45116bb30297 100644 --- a/trunk/drivers/mtd/devices/docprobe.c +++ b/trunk/drivers/mtd/devices/docprobe.c @@ -50,11 +50,6 @@ #include #include -/* Where to look for the devices? */ -#ifndef CONFIG_MTD_DOCPROBE_ADDRESS -#define CONFIG_MTD_DOCPROBE_ADDRESS 0 -#endif - static unsigned long doc_config_location = CONFIG_MTD_DOCPROBE_ADDRESS; module_param(doc_config_location, ulong, 0);