Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 250f8e3d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 464c9098 5903417c

drivers/net/sungem.c

+2 −1
Original line number Diff line number Diff line
@@ -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