diff options
author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-13 15:57:38 +0200 |
---|---|---|
committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-13 15:57:38 +0200 |
commit | f7f24758ac98a506770bc5910d33567610fa3403 (patch) | |
tree | ff7fad3d01bf9dc2e2e54b908f9fca4891e1ee72 /arch/ppc/syslib/mv64x60_win.c | |
parent | JFS: Code cleanup - getting rid of never-used debug code (diff) | |
parent | Linux 2.6.13-rc3 (diff) | |
download | linux-f7f24758ac98a506770bc5910d33567610fa3403.tar.xz linux-f7f24758ac98a506770bc5910d33567610fa3403.zip |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'arch/ppc/syslib/mv64x60_win.c')
-rw-r--r-- | arch/ppc/syslib/mv64x60_win.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ppc/syslib/mv64x60_win.c b/arch/ppc/syslib/mv64x60_win.c index b6f0f5dcf6ee..5b827e2bbe22 100644 --- a/arch/ppc/syslib/mv64x60_win.c +++ b/arch/ppc/syslib/mv64x60_win.c @@ -17,7 +17,6 @@ #include <linux/slab.h> #include <linux/module.h> #include <linux/string.h> -#include <linux/bootmem.h> #include <linux/mv643xx.h> #include <asm/byteorder.h> |