Remove incorrect CONFIG_IDE ifdef (CONFIG_IDE config option
is for internal drivers/ide/ use) and make IDE hardware
interface always initialized (not only when IDE subsystem
is built-in).

This patch allows Cayman board to work with modular IDE
subsystem support and removes the requirement of having
the whole core IDE subsystem built-in when using libata
PATA support.

Cc: Yoshinori Sato <[email protected]>
Cc: Rich Felker <[email protected]>
Signed-off-by: Bartlomiej Zolnierkiewicz <[email protected]>
---
Untested.

 arch/sh/boards/mach-cayman/setup.c |    2 --
 1 file changed, 2 deletions(-)

Index: b/arch/sh/boards/mach-cayman/setup.c
===================================================================
--- a/arch/sh/boards/mach-cayman/setup.c        2017-03-08 17:42:01.641323406 
+0100
+++ b/arch/sh/boards/mach-cayman/setup.c        2017-03-08 17:42:01.637323406 
+0100
@@ -128,7 +128,6 @@ static int __init smsc_superio_setup(voi
        SMSC_SUPERIO_WRITE_INDEXED(1, SMSC_PRIMARY_INT_INDEX);
        SMSC_SUPERIO_WRITE_INDEXED(12, SMSC_SECONDARY_INT_INDEX);
 
-#ifdef CONFIG_IDE
        /*
         * Only IDE1 exists on the Cayman
         */
@@ -158,7 +157,6 @@ static int __init smsc_superio_setup(voi
        SMSC_SUPERIO_WRITE_INDEXED(0x01, 0xc5); /* GP45 = IDE1_IRQ */
        SMSC_SUPERIO_WRITE_INDEXED(0x00, 0xc6); /* GP46 = nIOROP */
        SMSC_SUPERIO_WRITE_INDEXED(0x00, 0xc7); /* GP47 = nIOWOP */
-#endif
 
        /* Exit the configuration state */
        outb(SMSC_EXIT_CONFIG_KEY, SMSC_CONFIG_PORT_ADDR);

Reply via email to