[ide it8172] merge it8172.h into it8172.c

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

diff --git a/drivers/ide/pci/it8172.c b/drivers/ide/pci/it8172.c
index 58c1f3f99e01f778f61c75774b6eba72d085fc29..631927cf17d4df3f1c31d849697f35067d31ba2b 100644 (file)
--- a/drivers/ide/pci/it8172.c
+++ b/drivers/ide/pci/it8172.c
@@ -42,8 +42,6 @@
 #include <asm/io.h>
 #include <asm/it8172/it8172_int.h>
 
-#include "it8172.h"
-
 /*
  * Prototypes
  */
@@ -266,6 +264,18 @@ static void __init init_hwif_it8172 (ide_hwif_t *hwif)
        hwif->drives[1].autodma = hwif->autodma;
 }
 
+static ide_pci_device_t it8172_chipsets[] __devinitdata = {
+       {       /* 0 */
+               .name           = "IT8172G",
+               .init_chipset   = init_chipset_it8172,
+               .init_hwif      = init_hwif_it8172,
+               .channels       = 2,
+               .autodma        = AUTODMA,
+               .enablebits     = {{0x00,0x00,0x00}, {0x40,0x00,0x01}},
+               .bootable       = ON_BOARD,
+       }
+};
+
 static int __devinit it8172_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
         if ((!(PCI_FUNC(dev->devfn) & 1) ||

diff --git a/drivers/ide/pci/it8172.h b/drivers/ide/pci/it8172.h
deleted file mode 100644 (file)
index 2df3dd8..0000000
--- a/drivers/ide/pci/it8172.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef ITE8172G_H
-#define ITE8172G_H
-
-#include <linux/config.h>
-#include <linux/pci.h>
-#include <linux/ide.h>
-
-static u8 it8172_ratemask(ide_drive_t *drive);
-static void it8172_tune_drive(ide_drive_t *drive, u8 pio);
-static u8 it8172_dma_2_pio(u8 xfer_rate);
-static int it8172_tune_chipset(ide_drive_t *drive, u8 xferspeed);
-#ifdef CONFIG_BLK_DEV_IDEDMA
-static int it8172_config_chipset_for_dma(ide_drive_t *drive);
-#endif
-
-static unsigned int init_chipset_it8172(struct pci_dev *, const char *);
-static void init_hwif_it8172(ide_hwif_t *);
-
-static ide_pci_device_t it8172_chipsets[] __devinitdata = {
-       {       /* 0 */
-               .name           = "IT8172G",
-               .init_chipset   = init_chipset_it8172,
-               .init_hwif      = init_hwif_it8172,
-               .channels       = 2,
-               .autodma        = AUTODMA,
-               .enablebits     = {{0x00,0x00,0x00}, {0x40,0x00,0x01}},
-               .bootable       = ON_BOARD,
-       }
-};
-
-#endif /* ITE8172G_H */