Commit b7fb14d3ac63 ("ide: remove the legacy ide driver") removes the definition of the config BLK_DEV_PALMCHIP_BK3710. So, remove the obsolete references in the mach-davinci architecture. Signed-off-by: Lukas Bulwahn <lukas.bulwahn@xxxxxxxxx> --- arch/arm/mach-davinci/board-dm644x-evm.c | 3 +-- arch/arm/mach-davinci/board-dm646x-evm.c | 3 +-- arch/arm/mach-davinci/board-neuros-osd2.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c index cce3a621eb20..df6dbb3f0faf 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c @@ -834,8 +834,7 @@ static int davinci_phy_fixup(struct phy_device *phydev) return 0; } -#define HAS_ATA (IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \ - IS_ENABLED(CONFIG_PATA_BK3710)) +#define HAS_ATA IS_ENABLED(CONFIG_PATA_BK3710) #define HAS_NOR IS_ENABLED(CONFIG_MTD_PHYSMAP) diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c index ee91d81ebbfd..744ece6b6b9a 100644 --- a/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/arch/arm/mach-davinci/board-dm646x-evm.c @@ -151,8 +151,7 @@ static struct platform_device davinci_aemif_device = { .num_resources = ARRAY_SIZE(davinci_aemif_resources), }; -#define HAS_ATA (IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \ - IS_ENABLED(CONFIG_PATA_BK3710)) +#define HAS_ATA IS_ENABLED(CONFIG_PATA_BK3710) #ifdef CONFIG_I2C /* CPLD Register 0 bits to control ATA */ diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c index b4843f68bb57..81c21fe5748a 100644 --- a/arch/arm/mach-davinci/board-neuros-osd2.c +++ b/arch/arm/mach-davinci/board-neuros-osd2.c @@ -164,8 +164,7 @@ static struct davinci_mmc_config davinci_ntosd2_mmc_config = { .wires = 4, }; -#define HAS_ATA (IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \ - IS_ENABLED(CONFIG_PATA_BK3710)) +#define HAS_ATA IS_ENABLED(CONFIG_PATA_BK3710) #define HAS_NAND IS_ENABLED(CONFIG_MTD_NAND_DAVINCI) -- 2.17.1