diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-23 17:20:58 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-23 17:20:58 -0400 |
| commit | 9528454f9c02fb9c359c4c42c69eed4d47407e39 (patch) | |
| tree | 40e8c7f829b528073d2b216c3b8e6be205c76245 /drivers/pcmcia | |
| parent | 777e1d4a0f3387933f668e7adc81384827975189 (diff) | |
| parent | 1faadface9c5d000bb16e42c89f24859337cf2db (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/pd6729.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c index 16d1ea7b0a1..247ab837f84 100644 --- a/drivers/pcmcia/pd6729.c +++ b/drivers/pcmcia/pd6729.c @@ -589,7 +589,7 @@ static int pd6729_check_irq(int irq, int flags) return 0; } -static u_int __init pd6729_isa_scan(void) +static u_int __devinit pd6729_isa_scan(void) { u_int mask0, mask = 0; int i; |