diff options
Diffstat (limited to 'drivers/pcmcia/rsrc_mgr.c')
| -rw-r--r-- | drivers/pcmcia/rsrc_mgr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c index de0e770ce6a3..52db17263d8b 100644 --- a/drivers/pcmcia/rsrc_mgr.c +++ b/drivers/pcmcia/rsrc_mgr.c | |||
| @@ -126,16 +126,16 @@ static void pcmcia_align(void *align_data, struct resource *res, | |||
| 126 | res->start = start; | 126 | res->start = start; |
| 127 | 127 | ||
| 128 | #ifdef CONFIG_X86 | 128 | #ifdef CONFIG_X86 |
| 129 | if (res->flags & IORESOURCE_IO) { | 129 | if (res->flags & IORESOURCE_IO) { |
| 130 | if (start & 0x300) { | 130 | if (start & 0x300) { |
| 131 | start = (start + 0x3ff) & ~0x3ff; | 131 | start = (start + 0x3ff) & ~0x3ff; |
| 132 | res->start = start; | 132 | res->start = start; |
| 133 | } | 133 | } |
| 134 | } | 134 | } |
| 135 | #endif | 135 | #endif |
| 136 | 136 | ||
| 137 | #ifdef CONFIG_M68K | 137 | #ifdef CONFIG_M68K |
| 138 | if (res->flags & IORESOURCE_IO) { | 138 | if (res->flags & IORESOURCE_IO) { |
| 139 | if ((res->start + size - 1) >= 1024) | 139 | if ((res->start + size - 1) >= 1024) |
| 140 | res->start = res->end; | 140 | res->start = res->end; |
| 141 | } | 141 | } |