[PATCH]: ppowerpc: fix compile-time failure when EEH disabled.

linas
2006-01-09T19:59:05Z

Paul, please apply and fwd upstream.

--linas

Patch to fix compile problem reported by Olaf Herring:
Kernel fails to compile when CONFIG_EMBEDDED is enabled,
but CONFIG_EEH disabled.

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>

Index: linux-2.6.15-mm1/include/asm-powerpc/eeh.h
===================================================================
--- linux-2.6.15-mm1.orig/include/asm-powerpc/eeh.h 2006-01-09 12:23:39.698773976 -0600
+++ linux-2.6.15-mm1/include/asm-powerpc/eeh.h 2006-01-09 12:28:44.404818949 -0600
@@ -113,12 +113,11 @@
}

static inline void pci_addr_cache_build(void) { }
-
static inline void eeh_add_device_early(struct device_node *dn) { }
-
static inline void eeh_add_device_late(struct pci_dev *dev) { }
-
static inline void eeh_remove_device(struct pci_dev *dev) { }
+static inline void eeh_remove_bus_device(struct pci_dev *dev) { }
+static inline void eeh_add_device_tree_early(struct device_node *dn) { }

#define EEH_POSSIBLE_ERROR(val, type) (0)
#define EEH_IO_ERROR_VALUE(size) (-1UL)