diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-02 02:15:43 -0500 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-11-02 02:15:43 -0500 |
| commit | 2be7a906752abf8dce9350c23b6d1036049a5d3e (patch) | |
| tree | ef178fa5801bdce24938819086662bb747d8c0c2 /arch/ppc64 | |
| parent | aaf8a7a2949481482200686c7bd3852e5be2e093 (diff) | |
| parent | fbf1769d08a8b085834dceb228540153ac2cd534 (diff) | |
Merge Paulus' tree
Diffstat (limited to 'arch/ppc64')
| -rw-r--r-- | arch/ppc64/kernel/udbg_scc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/udbg_scc.c b/arch/ppc64/kernel/udbg_scc.c index c47fd6c63531..820c53551507 100644 --- a/arch/ppc64/kernel/udbg_scc.c +++ b/arch/ppc64/kernel/udbg_scc.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 13 | #include <asm/udbg.h> | 13 | #include <asm/udbg.h> |
| 14 | #include <asm/processor.h> | 14 | #include <asm/processor.h> |
| 15 | #include <asm/naca.h> | ||
| 16 | #include <asm/io.h> | 15 | #include <asm/io.h> |
| 17 | #include <asm/prom.h> | 16 | #include <asm/prom.h> |
| 18 | #include <asm/pmac_feature.h> | 17 | #include <asm/pmac_feature.h> |