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> Reviewed-by: Arnd Bergmann <arnd@xxxxxxxx> --- first send: https://lore.kernel.org/linux-arm-kernel/20210804123426.16947-3-lukas.bulwahn@xxxxxxxxx/ first resend: https://lore.kernel.org/linux-arm-kernel/20211011063624.12269-2-lukas.bulwahn@xxxxxxxxx/ another resend (as part of a larger series): https://lore.kernel.org/linux-arm-kernel/20211028141938.3530-6-lukas.bulwahn@xxxxxxxxx/ addition now in second resend: - added Arnd's Reviewed-by tag from https://lore.kernel.org/linux-arm-kernel/CAK8P3a2GGbik3r5BCKE2ZCkpFyzv8Q54z_iV84ZJ+kNXYUTMzw@xxxxxxxxxxxxxx/ 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 ebdd5c334ac1..4cde283f7f03 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c @@ -828,8 +828,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 28861fee493b..151e246c99b8 100644 --- a/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/arch/arm/mach-davinci/board-dm646x-evm.c @@ -146,8 +146,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 9748a2c12cc4..3b2298d686d5 100644 --- a/arch/arm/mach-davinci/board-neuros-osd2.c +++ b/arch/arm/mach-davinci/board-neuros-osd2.c @@ -160,8 +160,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