summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2011-07-29 17:31:16 +0200
committerJiri Kosina <jkosina@suse.cz>2011-07-29 17:31:16 +0200
commit5903417cd66d87a126f5cf27a846fc0985093f06 (patch)
tree0e6bfdb8f52cec7f5f3cc2866fad1caa6637cb53
parente08dc1325feaf49eec392ee52feb2974ec3f5155 (diff)
downloadop-kernel-dev-5903417cd66d87a126f5cf27a846fc0985093f06.zip
op-kernel-dev-5903417cd66d87a126f5cf27a846fc0985093f06.tar.gz
sungem: fix compile failure caused by trivial #include consolidation
Only Sparc and PPC actually have the asm/prom.h include and as such they can't be moved outside of the ifdefs. Reported-by: James Bottomley <James.Bottomley@HansenPartnership.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/net/sungem.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index be745ae..ade35dd 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -46,14 +46,15 @@
#include <asm/byteorder.h>
#include <asm/uaccess.h>
#include <asm/irq.h>
-#include <asm/prom.h>
#ifdef CONFIG_SPARC
#include <asm/idprom.h>
+#include <asm/prom.h>
#endif
#ifdef CONFIG_PPC_PMAC
#include <asm/pci-bridge.h>
+#include <asm/prom.h>
#include <asm/machdep.h>
#include <asm/pmac_feature.h>
#endif
OpenPOWER on IntegriCloud