diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:35:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:36:16 -0400 |
| commit | b257c14ceb1194a6181144210056d38f22127189 (patch) | |
| tree | c803925f1d5bf2237e7495d306bf43929df0c952 /arch/m68k/sun3x/dvma.c | |
| parent | 371fd7e7a56a5c136d31aa980011bd2f131c3ef5 (diff) | |
| parent | 2ba3abd8186f24c7fb418927025b4e2120e3a362 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: merge the latest fixes, update to -rc4.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/m68k/sun3x/dvma.c')
| -rw-r--r-- | arch/m68k/sun3x/dvma.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/sun3x/dvma.c b/arch/m68k/sun3x/dvma.c index 117481e86305..d5ddcdaa2347 100644 --- a/arch/m68k/sun3x/dvma.c +++ b/arch/m68k/sun3x/dvma.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include <linux/bitops.h> | 15 | #include <linux/bitops.h> |
| 16 | #include <linux/mm.h> | 16 | #include <linux/mm.h> |
| 17 | #include <linux/bootmem.h> | 17 | #include <linux/bootmem.h> |
| 18 | #include <linux/slab.h> | ||
| 19 | #include <linux/vmalloc.h> | 18 | #include <linux/vmalloc.h> |
| 20 | 19 | ||
| 21 | #include <asm/sun3x.h> | 20 | #include <asm/sun3x.h> |