diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-30 16:51:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-30 16:51:11 -0400 |
| commit | 250f8e3db646028353a2a737ddb7a894c97a1098 (patch) | |
| tree | 1a92e2b11faf832923fe1a42ec25d19c2957ec75 /drivers/net | |
| parent | 464c9098bbc17b4596aa12191a7e646a28e7587a (diff) | |
| parent | 5903417cd66d87a126f5cf27a846fc0985093f06 (diff) | |
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/net')
| -rw-r--r-- | drivers/net/sungem.c | 3 |
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 @@ | |||
| 46 | #include <asm/byteorder.h> | 46 | #include <asm/byteorder.h> |
| 47 | #include <asm/uaccess.h> | 47 | #include <asm/uaccess.h> |
| 48 | #include <asm/irq.h> | 48 | #include <asm/irq.h> |
| 49 | #include <asm/prom.h> | ||
| 50 | 49 | ||
| 51 | #ifdef CONFIG_SPARC | 50 | #ifdef CONFIG_SPARC |
| 52 | #include <asm/idprom.h> | 51 | #include <asm/idprom.h> |
| 52 | #include <asm/prom.h> | ||
| 53 | #endif | 53 | #endif |
| 54 | 54 | ||
| 55 | #ifdef CONFIG_PPC_PMAC | 55 | #ifdef CONFIG_PPC_PMAC |
| 56 | #include <asm/pci-bridge.h> | 56 | #include <asm/pci-bridge.h> |
| 57 | #include <asm/prom.h> | ||
| 57 | #include <asm/machdep.h> | 58 | #include <asm/machdep.h> |
| 58 | #include <asm/pmac_feature.h> | 59 | #include <asm/pmac_feature.h> |
| 59 | #endif | 60 | #endif |