aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2006-08-22 14:42:36 -0400
committerJohn W. Linville <linville@tuxdriver.com>2006-08-22 14:42:36 -0400
commit69758820a42da207bdc775d6eccf1f9fb67cd62e (patch)
tree4c4dd2b596aa5535231656bf0fa1bc65a8b17471 /scripts
parent113b898e38cb20e80847c24154ce62273b948c6a (diff)
parentef7d1b244fa6c94fb76d5f787b8629df64ea4046 (diff)
downloadkernel_samsung_aries-69758820a42da207bdc775d6eccf1f9fb67cd62e.zip
kernel_samsung_aries-69758820a42da207bdc775d6eccf1f9fb67cd62e.tar.gz
kernel_samsung_aries-69758820a42da207bdc775d6eccf1f9fb67cd62e.tar.bz2
Merge branch 'from-linus' into upstream
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mod/file2alias.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 4431292..e2de650 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -391,7 +391,7 @@ static void do_input(char *alias,
unsigned int i;
for (i = min; i < max; i++)
- if (arr[i / BITS_PER_LONG] & (1 << (i%BITS_PER_LONG)))
+ if (arr[i / BITS_PER_LONG] & (1L << (i%BITS_PER_LONG)))
sprintf(alias + strlen(alias), "%X,*", i);
}