summaryrefslogtreecommitdiff
path: root/drivers/spi/coldfire_qspi.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-18 09:27:10 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-18 09:27:10 -0700
commit6c8bfb7f7d43602c7f76060253bdaa493cd2e8b8 (patch)
tree33e4072d5539741e775788eb7dd0ffcf84208d3b /drivers/spi/coldfire_qspi.c
parentd9f5d41569731189e519fcee8578fcef5c916978 (diff)
parent5e1c53356d79591b10cdea12e3d5ebace8e7b6fa (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68knommu: include sched.h in ColdFire/SPI driver m68knommu: formatting of pointers in printk() m68knommu: arch/m68k/include/asm/ide.h fix for nommu
Diffstat (limited to 'drivers/spi/coldfire_qspi.c')
-rw-r--r--drivers/spi/coldfire_qspi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/coldfire_qspi.c b/drivers/spi/coldfire_qspi.c
index 59be3efe0636..052b3c7fa6a0 100644
--- a/drivers/spi/coldfire_qspi.c
+++ b/drivers/spi/coldfire_qspi.c
@@ -24,6 +24,7 @@
#include <linux/interrupt.h>
#include <linux/errno.h>
#include <linux/platform_device.h>
+#include <linux/sched.h>
#include <linux/workqueue.h>
#include <linux/delay.h>
#include <linux/io.h>