git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[XFS] Fix merge failures
[pandora-kernel.git]
/
arch
/
powerpc
/
include
/
asm
/
eeh.h
diff --git
a/arch/powerpc/include/asm/eeh.h
b/arch/powerpc/include/asm/eeh.h
index
b886bec
..
66ea9b8
100644
(file)
--- a/
arch/powerpc/include/asm/eeh.h
+++ b/
arch/powerpc/include/asm/eeh.h
@@
-17,8
+17,8
@@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _P
PC64
_EEH_H
-#define _P
PC64
_EEH_H
+#ifndef _P
OWERPC
_EEH_H
+#define _P
OWERPC
_EEH_H
#ifdef __KERNEL__
#include <linux/init.h>
#ifdef __KERNEL__
#include <linux/init.h>
@@
-110,6
+110,7
@@
static inline void eeh_remove_bus_device(struct pci_dev *dev) { }
#define EEH_IO_ERROR_VALUE(size) (-1UL)
#endif /* CONFIG_EEH */
#define EEH_IO_ERROR_VALUE(size) (-1UL)
#endif /* CONFIG_EEH */
+#ifdef CONFIG_PPC64
/*
* MMIO read/write operations with EEH support.
*/
/*
* MMIO read/write operations with EEH support.
*/
@@
-207,5
+208,6
@@
static inline void eeh_readsl(const volatile void __iomem *addr, void * buf,
eeh_check_failure(addr, *(u32*)buf);
}
eeh_check_failure(addr, *(u32*)buf);
}
+#endif /* CONFIG_PPC64 */
#endif /* __KERNEL__ */
#endif /* __KERNEL__ */
-#endif /* _P
PC64
_EEH_H */
+#endif /* _P
OWERPC
_EEH_H */