fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / ppc / boot / simple / misc-spruce.c

diff --git a/arch/ppc/boot/simple/misc-spruce.c b/arch/ppc/boot/simple/misc-spruce.c
index fa181ff..5b3a6c6 100644 (file)
--- a/arch/ppc/boot/simple/misc-spruce.c
+++ b/arch/ppc/boot/simple/misc-spruce.c
@@ -1,6 +1,4 @@
 /*
- * arch/ppc/boot/spruce/misc.c
- *
  * Misc. bootloader code for IBM Spruce reference platform
  *
  * Authors: Johnnie Peters <jpeters@mvista.com>
@@ -15,7 +13,6 @@
  */
 
 #include <linux/types.h>
-#include <linux/config.h>
 #include <linux/pci.h>
 
 #include <asm/bootinfo.h>
@@ -26,7 +23,6 @@ extern unsigned long decompress_kernel(unsigned long load_addr, int num_words,
 /* Define some important locations of the Spruce. */
 #define SPRUCE_PCI_CONFIG_ADDR 0xfec00000
 #define SPRUCE_PCI_CONFIG_DATA 0xfec00004
-#define SPRUCE_ISA_IO_BASE     0xf8000000
 
 /* PCI configuration space access routines. */
 unsigned int *pci_config_address = (unsigned int *)SPRUCE_PCI_CONFIG_ADDR;
@@ -86,8 +82,6 @@ void cpc700_pcibios_write_config_dword(unsigned char bus, unsigned char dev_fn,
        out_le32((unsigned *)pci_config_data, val);
 }
 
-unsigned long isa_io_base = SPRUCE_ISA_IO_BASE;
-
 #define PCNET32_WIO_RDP                0x10
 #define PCNET32_WIO_RAP                0x12
 #define PCNET32_WIO_RESET      0x14