diff options
| -rw-r--r-- | include/asm-generic/parport.h | 4 | ||||
| -rw-r--r-- | include/linux/ata_platform.h | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/asm-generic/parport.h b/include/asm-generic/parport.h index 40528cb977e8..2c9f9d4336ca 100644 --- a/include/asm-generic/parport.h +++ b/include/asm-generic/parport.h | |||
| @@ -10,8 +10,8 @@ | |||
| 10 | * to devices on the PCI bus. | 10 | * to devices on the PCI bus. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | static int __devinit parport_pc_find_isa_ports(int autoirq, int autodma); | 13 | static int parport_pc_find_isa_ports(int autoirq, int autodma); |
| 14 | static int __devinit parport_pc_find_nonpci_ports(int autoirq, int autodma) | 14 | static int parport_pc_find_nonpci_ports(int autoirq, int autodma) |
| 15 | { | 15 | { |
| 16 | #ifdef CONFIG_ISA | 16 | #ifdef CONFIG_ISA |
| 17 | return parport_pc_find_isa_ports(autoirq, autodma); | 17 | return parport_pc_find_isa_ports(autoirq, autodma); |
diff --git a/include/linux/ata_platform.h b/include/linux/ata_platform.h index fe9989636b62..b9fde17f767c 100644 --- a/include/linux/ata_platform.h +++ b/include/linux/ata_platform.h | |||
| @@ -15,12 +15,12 @@ struct pata_platform_info { | |||
| 15 | unsigned int irq_flags; | 15 | unsigned int irq_flags; |
| 16 | }; | 16 | }; |
| 17 | 17 | ||
| 18 | extern int __devinit __pata_platform_probe(struct device *dev, | 18 | extern int __pata_platform_probe(struct device *dev, |
| 19 | struct resource *io_res, | 19 | struct resource *io_res, |
| 20 | struct resource *ctl_res, | 20 | struct resource *ctl_res, |
| 21 | struct resource *irq_res, | 21 | struct resource *irq_res, |
| 22 | unsigned int ioport_shift, | 22 | unsigned int ioport_shift, |
| 23 | int __pio_mask); | 23 | int __pio_mask); |
| 24 | 24 | ||
| 25 | /* | 25 | /* |
| 26 | * Marvell SATA private data | 26 | * Marvell SATA private data |