summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-iop13xx/setup.c
diff options
context:
space:
mode:
authorTakashi Iwai2014-09-03 16:57:41 +0200
committerTakashi Iwai2014-09-03 16:57:41 +0200
commit05244d166739ae273fdc7a2151bdef61df49ca7d (patch)
tree9065482d33f445c90f0b99d29aa51485d1d96488 /arch/arm/mach-iop13xx/setup.c
parentALSA: hda - Fix COEF setups for ALC1150 codec (diff)
parentMerge remote-tracking branches 'asoc/fix/axi', 'asoc/fix/cs4265', 'asoc/fix/d... (diff)
downloadkernel-qcow2-linux-05244d166739ae273fdc7a2151bdef61df49ca7d.tar.gz
kernel-qcow2-linux-05244d166739ae273fdc7a2151bdef61df49ca7d.tar.xz
kernel-qcow2-linux-05244d166739ae273fdc7a2151bdef61df49ca7d.zip
Merge tag 'asoc-v3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.17 A few more driver specific fixes on top of the currently pending fixes (which are already in your tree but not Linus').
Diffstat (limited to 'arch/arm/mach-iop13xx/setup.c')
-rw-r--r--arch/arm/mach-iop13xx/setup.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-iop13xx/setup.c b/arch/arm/mach-iop13xx/setup.c
index bca96f433495..53c316f7301e 100644
--- a/arch/arm/mach-iop13xx/setup.c
+++ b/arch/arm/mach-iop13xx/setup.c
@@ -20,6 +20,7 @@
#include <linux/dma-mapping.h>
#include <linux/serial_8250.h>
#include <linux/io.h>
+#include <linux/reboot.h>
#ifdef CONFIG_MTD_PHYSMAP
#include <linux/mtd/physmap.h>
#endif