Commit 5903417cd66d87a126f5cf27a846fc0985093f06
1 parent
e08dc1325f
Exists in
master
and in
6 other branches
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>
Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff
drivers/net/sungem.c
| ... | ... | @@ -46,14 +46,15 @@ |
| 46 | 46 | #include <asm/byteorder.h> |
| 47 | 47 | #include <asm/uaccess.h> |
| 48 | 48 | #include <asm/irq.h> |
| 49 | -#include <asm/prom.h> | |
| 50 | 49 | |
| 51 | 50 | #ifdef CONFIG_SPARC |
| 52 | 51 | #include <asm/idprom.h> |
| 52 | +#include <asm/prom.h> | |
| 53 | 53 | #endif |
| 54 | 54 | |
| 55 | 55 | #ifdef CONFIG_PPC_PMAC |
| 56 | 56 | #include <asm/pci-bridge.h> |
| 57 | +#include <asm/prom.h> | |
| 57 | 58 | #include <asm/machdep.h> |
| 58 | 59 | #include <asm/pmac_feature.h> |
| 59 | 60 | #endif |