[ide pci generic] merge generic.h into generic.c

Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
index 0ce21e1936818c3d56ca04f76eb4d2753cbf8586..4565cc311ff3942cd0a8be18f6831f388c3fb6c3 100644 (file)
--- a/drivers/ide/pci/generic.c
+++ b/drivers/ide/pci/generic.c
@@ -39,8 +39,6 @@
 
 #include <asm/io.h>
 
-#include "generic.h"
-
 static void __devinit init_hwif_generic (ide_hwif_t *hwif)
 {
        switch(hwif->pci_dev->device) {
@@ -78,6 +76,89 @@ static void __devinit init_hwif_generic (ide_hwif_t *hwif)
        return 0;
 #endif 
 
+static ide_pci_device_t generic_chipsets[] __devinitdata = {
+       {       /* 0 */
+               .name           = "NS87410",
+               .init_hwif      = init_hwif_generic,
+               .channels       = 2,
+               .autodma        = AUTODMA,
+               .enablebits     = {{0x43,0x08,0x08}, {0x47,0x08,0x08}},
+               .bootable       = ON_BOARD,
+        },{    /* 1 */
+               .name           = "SAMURAI",
+               .init_hwif      = init_hwif_generic,
+               .channels       = 2,
+               .autodma        = AUTODMA,
+               .bootable       = ON_BOARD,
+       },{     /* 2 */
+               .name           = "HT6565",
+               .init_hwif      = init_hwif_generic,
+               .channels       = 2,
+               .autodma        = AUTODMA,
+               .bootable       = ON_BOARD,
+       },{     /* 3 */
+               .name           = "UM8673F",
+               .init_hwif      = init_hwif_generic,
+               .channels       = 2,
+               .autodma        = NODMA,
+               .bootable       = ON_BOARD,
+       },{     /* 4 */
+               .name           = "UM8886A",
+               .init_hwif      = init_hwif_generic,
+               .channels       = 2,
+               .autodma        = NODMA,
+               .bootable       = ON_BOARD,
+       },{     /* 5 */
+               .name           = "UM8886BF",
+               .init_hwif      = init_hwif_generic,
+               .channels       = 2,
+               .autodma        = NODMA,
+               .bootable       = ON_BOARD,
+       },{     /* 6 */
+               .name           = "HINT_IDE",
+               .init_hwif      = init_hwif_generic,
+               .channels       = 2,
+               .autodma        = AUTODMA,
+               .bootable       = ON_BOARD,
+       },{     /* 7 */
+               .name           = "VIA_IDE",
+               .init_hwif      = init_hwif_generic,
+               .channels       = 2,
+               .autodma        = NOAUTODMA,
+               .bootable       = ON_BOARD,
+       },{     /* 8 */
+               .name           = "OPTI621V",
+               .init_hwif      = init_hwif_generic,
+               .channels       = 2,
+               .autodma        = NOAUTODMA,
+               .bootable       = ON_BOARD,
+       },{     /* 9 */
+               .name           = "VIA8237SATA",
+               .init_hwif      = init_hwif_generic,
+               .channels       = 2,
+               .autodma        = AUTODMA,
+               .bootable       = OFF_BOARD,
+       },{     /* 10 */
+               .name           = "Piccolo0102",
+               .init_hwif      = init_hwif_generic,
+               .channels       = 2,
+               .autodma        = NOAUTODMA,
+               .bootable       = ON_BOARD,
+       },{     /* 11 */
+               .name           = "Piccolo0103",
+               .init_hwif      = init_hwif_generic,
+               .channels       = 2,
+               .autodma        = NOAUTODMA,
+               .bootable       = ON_BOARD,
+       },{     /* 12 */
+               .name           = "Piccolo0105",
+               .init_hwif      = init_hwif_generic,
+               .channels       = 2,
+               .autodma        = NOAUTODMA,
+               .bootable       = ON_BOARD,
+       }
+};
+
 /**
  *     generic_init_one        -       called when a PIIX is found
  *     @dev: the generic device

diff --git a/drivers/ide/pci/generic.h b/drivers/ide/pci/generic.h
deleted file mode 100644 (file)
index 0ab8342..0000000
--- a/drivers/ide/pci/generic.h
+++ /dev/null
@@ -1,93 +0,0 @@
-#ifndef IDE_GENERIC_H
-#define IDE_GENERIC_H
-
-#include <linux/config.h>
-#include <linux/pci.h>
-#include <linux/ide.h>
-
-static void init_hwif_generic(ide_hwif_t *);
-
-static ide_pci_device_t generic_chipsets[] __devinitdata = {
-       {       /* 0 */
-               .name           = "NS87410",
-               .init_hwif      = init_hwif_generic,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .enablebits     = {{0x43,0x08,0x08}, {0x47,0x08,0x08}},
-               .bootable       = ON_BOARD,
-        },{    /* 1 */
-               .name           = "SAMURAI",
-               .init_hwif      = init_hwif_generic,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .bootable       = ON_BOARD,
-       },{     /* 2 */
-               .name           = "HT6565",
-               .init_hwif      = init_hwif_generic,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .bootable       = ON_BOARD,
-       },{     /* 3 */
-               .name           = "UM8673F",
-               .init_hwif      = init_hwif_generic,
-               .channels       = 2,
-               .autodma        = NODMA,
-               .bootable       = ON_BOARD,
-       },{     /* 4 */
-               .name           = "UM8886A",
-               .init_hwif      = init_hwif_generic,
-               .channels       = 2,
-               .autodma        = NODMA,
-               .bootable       = ON_BOARD,
-       },{     /* 5 */
-               .name           = "UM8886BF",
-               .init_hwif      = init_hwif_generic,
-               .channels       = 2,
-               .autodma        = NODMA,
-               .bootable       = ON_BOARD,
-       },{     /* 6 */
-               .name           = "HINT_IDE",
-               .init_hwif      = init_hwif_generic,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .bootable       = ON_BOARD,
-       },{     /* 7 */
-               .name           = "VIA_IDE",
-               .init_hwif      = init_hwif_generic,
-               .channels       = 2,
-               .autodma        = NOAUTODMA,
-               .bootable       = ON_BOARD,
-       },{     /* 8 */
-               .name           = "OPTI621V",
-               .init_hwif      = init_hwif_generic,
-               .channels       = 2,
-               .autodma        = NOAUTODMA,
-               .bootable       = ON_BOARD,
-       },{     /* 9 */
-               .name           = "VIA8237SATA",
-               .init_hwif      = init_hwif_generic,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .bootable       = OFF_BOARD,
-       },{ /* 10 */
-               .name           = "Piccolo0102",
-               .init_hwif      = init_hwif_generic,
-               .channels       = 2,
-               .autodma        = NOAUTODMA,
-               .bootable       = ON_BOARD,
-       },{ /* 11 */
-               .name           = "Piccolo0103",
-               .init_hwif      = init_hwif_generic,
-               .channels       = 2,
-               .autodma        = NOAUTODMA,
-               .bootable       = ON_BOARD,
-       },{ /* 12 */
-               .name           = "Piccolo0105",
-               .init_hwif      = init_hwif_generic,
-               .channels       = 2,
-               .autodma        = NOAUTODMA,
-               .bootable       = ON_BOARD,
-       }
-};
-
-#endif /* IDE_GENERIC_H */