summaryrefslogtreecommitdiff
path: root/arch/arm/mach-w90x900
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-30 17:00:34 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-30 17:00:34 -0700
commitc39e8ede284f469971589f2e04af78216e1a771d (patch)
tree1134c135c1628eb468e106f5da1dc2850089cf27 /arch/arm/mach-w90x900
parenta335750b9a039a9d4cd727cdccacfb90fd63c4e8 (diff)
parentd3c7de52096a201ac188adb95b8351b90cab11f1 (diff)
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull a few more ARM platform fixes from Olof Johansson: "Apologies for back-to-back fixes pull requests, but one of the patches below are the kind we'll see posted over and over if we don't send it in. I hadn't done the full sanity-check of defconfig builds by the time I sent up the other fixes yesterday or I would have included it then. Two patches, one dealing with the system.h fallout, the other is a missing linux/bug.h in a place where ARRAY_SIZE() is used." * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: clps711x: fix missing include file ARM: fix builds due to missing <asm/system_misc.h> includes
Diffstat (limited to 'arch/arm/mach-w90x900')
-rw-r--r--arch/arm/mach-w90x900/dev.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-w90x900/dev.c b/arch/arm/mach-w90x900/dev.c
index db82568a998a..48f5b9fdfb7f 100644
--- a/arch/arm/mach-w90x900/dev.c
+++ b/arch/arm/mach-w90x900/dev.c
@@ -27,6 +27,7 @@
#include <linux/spi/spi.h>
#include <linux/spi/flash.h>
+#include <asm/system_misc.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/irq.h>