summaryrefslogtreecommitdiffstats
path: root/arch/m68k/bvme6000/config.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-12 17:19:20 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-12 17:19:20 +0100
commit68556ca1e03d6a35be3b315eba58df2f8176e3a0 (patch)
tree36a390d29a0d03a59a90c0f223b0d98a80f0f6c3 /arch/m68k/bvme6000/config.c
parentASoC: Add missed MODULE_LICENSE("GPL") for imx-pcm-fiq (diff)
parentmfd: Convert wm8994 to use generic regmap irq_chip (diff)
downloadlinux-68556ca1e03d6a35be3b315eba58df2f8176e3a0.tar.xz
linux-68556ca1e03d6a35be3b315eba58df2f8176e3a0.zip
Merge branch 'mfd/wm8994' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc into for-3.3
Diffstat (limited to 'arch/m68k/bvme6000/config.c')
-rw-r--r--arch/m68k/bvme6000/config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c
index 1edd95095cb4..81286476f740 100644
--- a/arch/m68k/bvme6000/config.c
+++ b/arch/m68k/bvme6000/config.c
@@ -86,7 +86,7 @@ static void bvme6000_get_model(char *model)
*/
static void __init bvme6000_init_IRQ(void)
{
- m68k_setup_user_interrupt(VEC_USER, 192, NULL);
+ m68k_setup_user_interrupt(VEC_USER, 192);
}
void __init config_bvme6000(void)