From 5903417cd66d87a126f5cf27a846fc0985093f06 Mon Sep 17 00:00:00 2001 From: Jiri Kosina <jkosina@suse.cz> Date: Fri, 29 Jul 2011 17:31:16 +0200 Subject: 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> --- drivers/net/sungem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'drivers/net') 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 -- cgit v1.2.3