diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-04 07:51:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-04 07:51:36 -0800 |
| commit | a2e28fc1164e56d37a56e3c53bd3e5a64462fd02 (patch) | |
| tree | 144dfddbd6d619db549bf43e43ddc116f29e9774 /drivers/pcmcia/rsrc_mgr.c | |
| parent | 03a2c4d76c9e99b80d74ab8a4f344e135a5ae44b (diff) | |
| parent | a3f916f2c84f2b9e1d32cc0dbfe326a9e380dbfb (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
pcmcia: disable pcmcia ioctl for !ARM, prepare for removal
pcmcia: CodingStyle fixes
pcmcia: alchemy: fixup wrong comments
pcmcia: remove irq_list parameter from pd6729
yenta_socket: ENE CB712 CardBus bridge needs special treatment with Echo Audio Indigo soundcards
Diffstat (limited to 'drivers/pcmcia/rsrc_mgr.c')
| -rw-r--r-- | drivers/pcmcia/rsrc_mgr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c index e6f7d410aed6..452c83b512c4 100644 --- a/drivers/pcmcia/rsrc_mgr.c +++ b/drivers/pcmcia/rsrc_mgr.c @@ -79,9 +79,8 @@ static resource_size_t pcmcia_align(void *align_data, #ifdef CONFIG_X86 if (res->flags & IORESOURCE_IO) { - if (start & 0x300) { + if (start & 0x300) start = (start + 0x3ff) & ~0x3ff; - } } #endif |