aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/parport
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2007-02-20 16:58:18 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-20 20:10:16 -0500
commit0bb92e6cd313cf209ea0c164952d1f65c5b3ea46 (patch)
treeda38f5bbd26ff319e160386edf5657d0cff84902 /drivers/parport
parent6d740cd5b18bc8128e70f98cfde8c74ebd21cea1 (diff)
[PATCH] parport_pc: fix parport_pc_probe_port section warning
WARNING: drivers/parport/parport_pc.o - Section mismatch: reference to .init.text: from .text between 'parport_pc_probe_port' (at offset 0x14f7) and 'parport_pc_unregister_port' parport_dma_probe() cannot be declared __devinit as it is called from parport_pc_probe_port() which isn't. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/parport')
-rw-r--r--drivers/parport/parport_pc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index b61c17b3e298..3de2623afa13 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -1546,7 +1546,7 @@ static void __devinit detect_and_report_smsc (void)
1546} 1546}
1547#endif /* CONFIG_PARPORT_PC_SUPERIO */ 1547#endif /* CONFIG_PARPORT_PC_SUPERIO */
1548 1548
1549static int __devinit get_superio_dma (struct parport *p) 1549static int get_superio_dma (struct parport *p)
1550{ 1550{
1551 int i=0; 1551 int i=0;
1552 while( (superios[i].io != p->base) && (i<NR_SUPERIOS)) 1552 while( (superios[i].io != p->base) && (i<NR_SUPERIOS))
@@ -2106,7 +2106,7 @@ static int parport_irq_probe(struct parport *pb)
2106/* --- DMA detection -------------------------------------- */ 2106/* --- DMA detection -------------------------------------- */
2107 2107
2108/* Only if chipset conforms to ECP ISA Interface Standard */ 2108/* Only if chipset conforms to ECP ISA Interface Standard */
2109static int __devinit programmable_dma_support (struct parport *p) 2109static int programmable_dma_support (struct parport *p)
2110{ 2110{
2111 unsigned char oecr = inb (ECONTROL (p)); 2111 unsigned char oecr = inb (ECONTROL (p));
2112 int dma; 2112 int dma;
@@ -2123,7 +2123,7 @@ static int __devinit programmable_dma_support (struct parport *p)
2123 return dma; 2123 return dma;
2124} 2124}
2125 2125
2126static int __devinit parport_dma_probe (struct parport *p) 2126static int parport_dma_probe (struct parport *p)
2127{ 2127{
2128 const struct parport_pc_private *priv = p->private_data; 2128 const struct parport_pc_private *priv = p->private_data;
2129 if (priv->ecr) 2129 if (priv->ecr)