summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-31 09:14:12 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-31 09:14:12 -0700
commit0e9871df2389560e94ba01e40959140ee56def4b (patch)
tree249e21834a45ab2fb96f25141675f343c1f2490a /drivers
parentb9066c268abfe353edf5d646bb486bc03c839348 (diff)
parent8a73709ecc6a972c94e6ff9c0cc639f8f38b9151 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC]: Missing #include <linux/mm.h> in drivers/sbus/char/flash.c [SPARC32]: Build fix. [SPARC64]: Add missing NCS and SVC hypervisor interfaces.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/sbus/char/flash.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c
index 262f01e6859..44e039865aa 100644
--- a/drivers/sbus/char/flash.c
+++ b/drivers/sbus/char/flash.c
@@ -14,6 +14,7 @@
#include <linux/init.h>
#include <linux/smp_lock.h>
#include <linux/spinlock.h>
+#include <linux/mm.h>
#include <asm/system.h>
#include <asm/uaccess.h>