diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 19:49:45 +0200 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 19:49:45 +0200 |
commit | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (patch) | |
tree | 2624a44924c625c367f3cebf937853b9da2de282 /arch/um/sys-ppc/misc.S | |
parent | Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ (diff) | |
parent | [PATCH] genirq: Fixup ARM devel merge (diff) | |
download | linux-026477c1141b67e98e3bd8bdedb7d4b88a3ecd09.tar.xz linux-026477c1141b67e98e3bd8bdedb7d4b88a3ecd09.zip |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'arch/um/sys-ppc/misc.S')
-rw-r--r-- | arch/um/sys-ppc/misc.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/sys-ppc/misc.S b/arch/um/sys-ppc/misc.S index f0c971db47e4..1364b7da578c 100644 --- a/arch/um/sys-ppc/misc.S +++ b/arch/um/sys-ppc/misc.S @@ -15,7 +15,6 @@ * */ -#include <linux/config.h> #include <asm/processor.h> #include "ppc_asm.h" |