summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/generic.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-11-13 07:48:07 +0100
committerTakashi Iwai <tiwai@suse.de>2012-11-13 07:48:07 +0100
commit6214b54cbf0778804de1297444c7661e70bc4d74 (patch)
tree262a96d1be839a30e6e8d3f3452806b7f337148c /arch/arm/mach-at91/generic.h
parent05193639ca977cc889668718adb38db6d585045b (diff)
parentba027da8eb309252cb611f23808da51487f68e12 (diff)
downloadlinux-6214b54cbf0778804de1297444c7661e70bc4d74.tar.gz
linux-6214b54cbf0778804de1297444c7661e70bc4d74.tar.bz2
linux-6214b54cbf0778804de1297444c7661e70bc4d74.zip
Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.7 A few small fixes plus a large but simple change for WM5102 which writes out a bunch of register updates to the device when we enable the clock as recommended following chip evaluation.
Diffstat (limited to 'arch/arm/mach-at91/generic.h')
-rw-r--r--arch/arm/mach-at91/generic.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h
index f49650677653..b62f560e6c75 100644
--- a/arch/arm/mach-at91/generic.h
+++ b/arch/arm/mach-at91/generic.h
@@ -26,7 +26,8 @@ extern void __init at91_dt_initialize(void);
extern void __init at91_init_irq_default(void);
extern void __init at91_init_interrupts(unsigned int priority[]);
extern void __init at91x40_init_interrupts(unsigned int priority[]);
-extern void __init at91_aic_init(unsigned int priority[]);
+extern void __init at91_aic_init(unsigned int priority[],
+ unsigned int ext_irq_mask);
extern int __init at91_aic_of_init(struct device_node *node,
struct device_node *parent);
extern int __init at91_aic5_of_init(struct device_node *node,