diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
| commit | 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 (patch) | |
| tree | 7ff8833745d2f268f897f6fa4a27263b4a572245 /fs/seq_file.c | |
| parent | de18836e447c2dc30120c0919b8db8ddc0401cc4 (diff) | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
Merge branch 'linus' into irq/threaded
Conflicts:
include/linux/irq.h
kernel/irq/handle.c
Diffstat (limited to 'fs/seq_file.c')
| -rw-r--r-- | fs/seq_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/seq_file.c b/fs/seq_file.c index a1a4cfe19210..7f40f30c55c5 100644 --- a/fs/seq_file.c +++ b/fs/seq_file.c | |||
| @@ -513,7 +513,7 @@ int seq_bitmap(struct seq_file *m, const unsigned long *bits, | |||
| 513 | } | 513 | } |
| 514 | EXPORT_SYMBOL(seq_bitmap); | 514 | EXPORT_SYMBOL(seq_bitmap); |
| 515 | 515 | ||
| 516 | int seq_bitmap_list(struct seq_file *m, unsigned long *bits, | 516 | int seq_bitmap_list(struct seq_file *m, const unsigned long *bits, |
| 517 | unsigned int nr_bits) | 517 | unsigned int nr_bits) |
| 518 | { | 518 | { |
| 519 | if (m->count < m->size) { | 519 | if (m->count < m->size) { |