From 8f3f1f23b92caff5f59def191f9f4300351d6b5f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 21 Dec 2012 15:15:49 -0800 Subject: [PATCH] --- yaml --- r: 348225 b: refs/heads/master c: e389623a68622e3c9be440ab522fac1aa1ca3454 h: refs/heads/master i: 348223: b4676aef1c300b625609cdc984ee95e41ee9d226 v: v3 --- [refs] | 2 +- trunk/include/asm-generic/parport.h | 4 ++-- trunk/include/linux/ata_platform.h | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 336b4ef3efd1..dd8fb7da0b77 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 63a29f744fe1c19742039ce7526663a98f172f7e +refs/heads/master: e389623a68622e3c9be440ab522fac1aa1ca3454 diff --git a/trunk/include/asm-generic/parport.h b/trunk/include/asm-generic/parport.h index 40528cb977e8..2c9f9d4336ca 100644 --- a/trunk/include/asm-generic/parport.h +++ b/trunk/include/asm-generic/parport.h @@ -10,8 +10,8 @@ * to devices on the PCI bus. */ -static int __devinit parport_pc_find_isa_ports(int autoirq, int autodma); -static int __devinit parport_pc_find_nonpci_ports(int autoirq, int autodma) +static int parport_pc_find_isa_ports(int autoirq, int autodma); +static int parport_pc_find_nonpci_ports(int autoirq, int autodma) { #ifdef CONFIG_ISA return parport_pc_find_isa_ports(autoirq, autodma); diff --git a/trunk/include/linux/ata_platform.h b/trunk/include/linux/ata_platform.h index fe9989636b62..b9fde17f767c 100644 --- a/trunk/include/linux/ata_platform.h +++ b/trunk/include/linux/ata_platform.h @@ -15,12 +15,12 @@ struct pata_platform_info { unsigned int irq_flags; }; -extern int __devinit __pata_platform_probe(struct device *dev, - struct resource *io_res, - struct resource *ctl_res, - struct resource *irq_res, - unsigned int ioport_shift, - int __pio_mask); +extern int __pata_platform_probe(struct device *dev, + struct resource *io_res, + struct resource *ctl_res, + struct resource *irq_res, + unsigned int ioport_shift, + int __pio_mask); /* * Marvell SATA private data