Folks, Any objection to the following patch, which lets IDE work on 2.6 for SiByte platforms? Before getting it checked in, I'm willing to hear style comments. I need extra work to happen in ide_init_default_hwifs, but that code doesn't fit well in <asm/ide.h> because most of the useful declarations in <linux/ide.h> haven't been made yet. With this patch, I hoist the code into a C file, but can call back into the existing code (avoiding maintaining a duplicate). Kip Index: include/asm-mips/ide.h =================================================================== RCS file: /home/cvs/linux/include/asm-mips/ide.h,v retrieving revision 1.22 diff -u -r1.22 ide.h --- include/asm-mips/ide.h 21 Jun 2003 14:08:28 -0000 1.22 +++ include/asm-mips/ide.h 3 Sep 2003 23:42:16 -0000 @@ -50,7 +50,12 @@ ide_ops->ide_init_hwif_ports(hw, data_port, ctrl_port, irq); } +#ifdef CONFIG_SIBYTE_SB1xxx_SOC +extern void ide_init_default_hwifs(void); +static __inline__ void mips_ide_init_default_hwifs(void) +#else static __inline__ void ide_init_default_hwifs(void) +#endif { #ifndef CONFIG_PCI hw_regs_t hw;