diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-31 12:14:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-31 12:14:12 -0400 |
| commit | 0e9871df2389560e94ba01e40959140ee56def4b (patch) | |
| tree | 249e21834a45ab2fb96f25141675f343c1f2490a /drivers | |
| parent | b9066c268abfe353edf5d646bb486bc03c839348 (diff) | |
| parent | 8a73709ecc6a972c94e6ff9c0cc639f8f38b9151 (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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c index 262f01e68592..44e039865aa9 100644 --- a/drivers/sbus/char/flash.c +++ b/drivers/sbus/char/flash.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 15 | #include <linux/smp_lock.h> | 15 | #include <linux/smp_lock.h> |
| 16 | #include <linux/spinlock.h> | 16 | #include <linux/spinlock.h> |
| 17 | #include <linux/mm.h> | ||
| 17 | 18 | ||
| 18 | #include <asm/system.h> | 19 | #include <asm/system.h> |
| 19 | #include <asm/uaccess.h> | 20 | #include <asm/uaccess.h> |