Merge commit 'gcl/gcl-next'

[linux-2.6] / include / linux / ide.h

diff --git a/include/linux/ide.h b/include/linux/ide.h
index fd78b401b036036d83bddd6b56fd4649073798f6..b846bc44a27ed62a62c6c30cf69ed2897579e7f1 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1206,7 +1206,7 @@ enum {
 
 struct ide_port_info {
        char                    *name;
-       unsigned int            (*init_chipset)(struct pci_dev *, const char *);
+       unsigned int            (*init_chipset)(struct pci_dev *);
        void                    (*init_iops)(ide_hwif_t *);
        void                    (*init_hwif)(ide_hwif_t *);
        int                     (*init_dma)(ide_hwif_t *,