Merge branch 'merge'

This commit is contained in:
Paul Mackerras 2006-08-31 15:45:48 +10:00
commit aa43f77939
521 changed files with 17283 additions and 6165 deletions

View file

@ -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);
}