fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / asm-ppc / mpc83xx.h

diff --git a/include/asm-ppc/mpc83xx.h b/include/asm-ppc/mpc83xx.h
index 7cdf60f..c306197 100644 (file)
--- a/include/asm-ppc/mpc83xx.h
+++ b/include/asm-ppc/mpc83xx.h
@@ -17,7 +17,6 @@
 #ifndef __ASM_MPC83xx_H__
 #define __ASM_MPC83xx_H__
 
-#include <linux/config.h>
 #include <asm/mmu.h>
 
 #ifdef CONFIG_83xx
@@ -26,14 +25,6 @@
 #include <platforms/83xx/mpc834x_sys.h>
 #endif
 
-#define _IO_BASE        isa_io_base
-#define _ISA_MEM_BASE   isa_mem_base
-#ifdef CONFIG_PCI
-#define PCI_DRAM_OFFSET pci_dram_offset
-#else
-#define PCI_DRAM_OFFSET 0
-#endif
-
 /*
  * The "residual" board information structure the boot loader passes
  * into the kernel.
@@ -108,6 +99,7 @@ enum ppc_sys_devices {
        MPC83xx_USB2_DR,
        MPC83xx_USB2_MPH,
        MPC83xx_MDIO,
+       NUM_PPC_SYS_DEVS,
 };
 
 #endif /* CONFIG_83xx */