diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-12-06 06:42:35 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-06 06:43:49 +0100 |
| commit | d6c1c49de577fa292af2449817364b7d89b574d8 (patch) | |
| tree | e97cf88a318f50eb23c18d790e8b0bcf7bb47169 /arch/m68k/mvme16x/config.c | |
| parent | 9dde9dc0a81c7aeb863b35121d09011f09b4897c (diff) | |
| parent | ddf6e0e50723b62ac76ed18eb53e9417c6eefba7 (diff) | |
| download | linux-d6c1c49de577fa292af2449817364b7d89b574d8.tar.gz linux-d6c1c49de577fa292af2449817364b7d89b574d8.tar.bz2 linux-d6c1c49de577fa292af2449817364b7d89b574d8.zip | |
Merge branch 'perf/urgent' into perf/core
Merge reason: Add these cherry-picked commits so that future changes
on perf/core don't conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/m68k/mvme16x/config.c')
| -rw-r--r-- | arch/m68k/mvme16x/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c index 0b28e2621653..31a66d99cbca 100644 --- a/arch/m68k/mvme16x/config.c +++ b/arch/m68k/mvme16x/config.c @@ -117,7 +117,7 @@ static void mvme16x_get_hardware_list(struct seq_file *m) static void __init mvme16x_init_IRQ (void) { - m68k_setup_user_interrupt(VEC_USER, 192, NULL); + m68k_setup_user_interrupt(VEC_USER, 192); } #define pcc2chip ((volatile u_char *)0xfff42000) |