diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
| commit | c973b112c76c9d8fd042991128f218a738cc8d0a (patch) | |
| tree | e813b0da5d0a0e19e06de6462d145a29ad683026 /arch/ppc/syslib/m8260_setup.c | |
| parent | c5fbc3966f48279dbebfde10248c977014aa9988 (diff) | |
| parent | 00dd1e433967872f3997a45d5adf35056fdf2f56 (diff) | |
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'arch/ppc/syslib/m8260_setup.c')
| -rw-r--r-- | arch/ppc/syslib/m8260_setup.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ppc/syslib/m8260_setup.c b/arch/ppc/syslib/m8260_setup.c index fda75d79050c..8f80a42dfdb7 100644 --- a/arch/ppc/syslib/m8260_setup.c +++ b/arch/ppc/syslib/m8260_setup.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | #include <asm/io.h> | 24 | #include <asm/io.h> |
| 25 | #include <asm/pgtable.h> | 25 | #include <asm/pgtable.h> |
| 26 | #include <asm/mpc8260.h> | 26 | #include <asm/mpc8260.h> |
| 27 | #include <asm/immap_cpm2.h> | 27 | #include <asm/cpm2.h> |
| 28 | #include <asm/machdep.h> | 28 | #include <asm/machdep.h> |
| 29 | #include <asm/bootinfo.h> | 29 | #include <asm/bootinfo.h> |
| 30 | #include <asm/time.h> | 30 | #include <asm/time.h> |
| @@ -33,7 +33,6 @@ | |||
| 33 | 33 | ||
| 34 | unsigned char __res[sizeof(bd_t)]; | 34 | unsigned char __res[sizeof(bd_t)]; |
| 35 | 35 | ||
| 36 | extern void cpm2_reset(void); | ||
| 37 | extern void pq2_find_bridges(void); | 36 | extern void pq2_find_bridges(void); |
| 38 | extern void pq2pci_init_irq(void); | 37 | extern void pq2pci_init_irq(void); |
| 39 | extern void idma_pci9_init(void); | 38 | extern void idma_pci9_init(void); |