diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-06-01 05:05:23 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-06-01 05:05:23 -0400 |
| commit | c029cc66cb3d83f70c02e0c182f0eed1419f8020 (patch) | |
| tree | b9ed887a0e6434fedebcbf90b3d2ba1aeff68a01 /drivers/pcmcia/pd6729.c | |
| parent | 0a9cb46a73abd6c45e7c986bec984eed60c417b6 (diff) | |
| parent | ba8f5baba79da8eb502f8534c3a8ecb64aceb790 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'drivers/pcmcia/pd6729.c')
| -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 16d1ea7b0a18..247ab837f841 100644 --- a/drivers/pcmcia/pd6729.c +++ b/drivers/pcmcia/pd6729.c | |||
| @@ -589,7 +589,7 @@ static int pd6729_check_irq(int irq, int flags) | |||
| 589 | return 0; | 589 | return 0; |
| 590 | } | 590 | } |
| 591 | 591 | ||
| 592 | static u_int __init pd6729_isa_scan(void) | 592 | static u_int __devinit pd6729_isa_scan(void) |
| 593 | { | 593 | { |
| 594 | u_int mask0, mask = 0; | 594 | u_int mask0, mask = 0; |
| 595 | int i; | 595 | int i; |