projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
[cascardo/linux.git]
/
drivers
/
pcmcia
/
rsrc_mgr.c
diff --git
a/drivers/pcmcia/rsrc_mgr.c
b/drivers/pcmcia/rsrc_mgr.c
index
e6f7d41
..
452c83b
100644
(file)
--- 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