summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2013-02-24 13:23:56 +0400
committerSascha Hauer <s.hauer@pengutronix.de>2013-02-25 08:57:40 +0100
commitcb8ee706afdcf89a15ff3ce1a16de1abd8964025 (patch)
tree5eadcc357a9b063586ac47ee99ddd01da8a05cc3
parent97dfd44a579ecfd45f68d14c2b65c8df30fa42f3 (diff)
downloadbarebox-cb8ee706afdcf89a15ff3ce1a16de1abd8964025.tar.gz
barebox-cb8ee706afdcf89a15ff3ce1a16de1abd8964025.tar.xz
ARM: pcm970: Replace #ifdef with IS_ENABLED()
Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/boards/pcm038/pcm970.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/boards/pcm038/pcm970.c b/arch/arm/boards/pcm038/pcm970.c
index dd95f52636..b176d8dd09 100644
--- a/arch/arm/boards/pcm038/pcm970.c
+++ b/arch/arm/boards/pcm038/pcm970.c
@@ -27,7 +27,6 @@
#define GPIO_IDE_PCOE (GPIO_PORTF + 7)
#define GPIO_IDE_RESET (GPIO_PORTF + 10)
-#ifdef CONFIG_DISK_INTF_PLATFORM_IDE
static struct resource pcm970_ide_resources[] = {
{
.start = MX27_PCMCIA_MEM_BASE_ADDR,
@@ -125,7 +124,6 @@ static void pcm970_ide_init(void)
platform_device_register(&pcm970_ide_device);
}
-#endif
static void pcm970_mmc_init(void)
{
@@ -185,9 +183,8 @@ static int pcm970_init(void)
imx27_add_usbh2(&pcm970_usbh2_pdata);
}
-#ifdef CONFIG_DISK_INTF_PLATFORM_IDE
- pcm970_ide_init();
-#endif
+ if (IS_ENABLED(CONFIG_DISK_INTF_PLATFORM_IDE))
+ pcm970_ide_init();
if (IS_ENABLED(CONFIG_MCI_IMX))
pcm970_mmc_init();