Broadcom SWARM IDE in 2.6

Hi Steve,

I had sent an incomplete patch before. Please try out this new patch, attached. Let me know if it works

Thanks
Manish Lachwani

@@ -20,7 +20,7 @@
 # endif
 #endif
 
-#define IDE_ARCH_OBSOLETE_DEFAULTS
+#undef IDE_ARCH_OBSOLETE_DEFAULTS
 
 static inline int ide_default_irq(unsigned long base)
 {

@@ -50,7 +50,7 @@
 	}
 }
 
-#define IDE_ARCH_OBSOLETE_INIT
+#undef IDE_ARCH_OBSOLETE_INIT 
 #define ide_default_io_ctl(base)	((base) + 0x206) /* obsolete */
 
 #ifdef CONFIG_BLK_DEV_IDEPCI

@@ -2064,6 +2064,12 @@
 		q40ide_init();
 	}
 #endif /* CONFIG_BLK_DEV_Q40IDE */
+#ifdef CONFIG_BLK_DEV_IDE_SWARM
+	{
+		extern void swarm_ide_probe(void);
+		swarm_ide_probe();
+	}
+#endif
 #ifdef CONFIG_BLK_DEV_BUDDHA
 	{
 		extern void buddha_init(void);

Manish,

This patch worked, however you need to fix a compiler warning before I am willing to commit it. Please get rid of the warning shown below and submit a new patch. Thanks!

-Steve

*******************

CC drivers/ide/ide-generic.o
In file included from drivers/ide/ide-generic.c:13:
include/linux/ide.h:277:1: warning: "ide_init_default_irq" redefined In file included from include/asm/ide.h:11,

                 from include/linux/ide.h:271,
                 from drivers/ide/ide-generic.c:13:

include/asm-mips/mach-generic/ide.h:64:1: warning: this is the location of the previous definition

Hi Steve,

"ide_init_default_irq" is defined in include/linux/ide.h and in include/asm-mips/mach-generic/ide.h.

include/asm-mips/mach-generic/ide.h and include/asm-i386/ide.h are replicas. So, this compiler warning should appear on other platforms as well.

I have sent an email out to Jeff Garzik to understand why "ide_init_default_irq" is redefined

Thanks
Manish Lachwani