summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-30 10:51:11 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-30 10:51:11 -1000
commit250f8e3db646028353a2a737ddb7a894c97a1098 (patch)
tree1a92e2b11faf832923fe1a42ec25d19c2957ec75 /drivers
parent464c9098bbc17b4596aa12191a7e646a28e7587a (diff)
parent5903417cd66d87a126f5cf27a846fc0985093f06 (diff)
downloadlinux-250f8e3db646028353a2a737ddb7a894c97a1098.tar.bz2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: sungem: fix compile failure caused by trivial #include consolidation
Diffstat (limited to 'drivers')
-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 be745ae8f4e3..ade35dde5b51 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