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

Commit c39e8ede authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull a few more ARM platform fixes from Olof Johansson:
 "Apologies for back-to-back fixes pull requests, but one of the patches
  below are the kind we'll see posted over and over if we don't send it
  in.  I hadn't done the full sanity-check of defconfig builds by the
  time I sent up the other fixes yesterday or I would have included it
  then.

  Two patches, one dealing with the system.h fallout, the other is a
  missing linux/bug.h in a place where ARRAY_SIZE() is used."

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: clps711x: fix missing include file
  ARM: fix builds due to missing <asm/system_misc.h> includes
parents a335750b d3c7de52

arch/arm/mach-at91/at91x40.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/init.h>

#include <linux/irq.h>

#include <asm/proc-fns.h>

#include <asm/system_misc.h>

#include <asm/mach/arch.h>

#include <mach/at91x40.h>

#include <mach/at91_st.h>

arch/arm/mach-at91/setup.c

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/pm.h>

#include <linux/of_address.h>



#include <asm/system_misc.h>

#include <asm/mach/map.h>



#include <mach/hardware.h>

arch/arm/mach-clps711x/edb7211-mm.c

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
 */

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/bug.h>



#include <mach/hardware.h>

#include <asm/page.h>

arch/arm/mach-h720x/common.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <asm/dma.h>

#include <mach/hardware.h>

#include <asm/irq.h>

#include <asm/system_misc.h>

#include <asm/mach/irq.h>

#include <asm/mach/map.h>

#include <mach/irqs.h>

arch/arm/mach-imx/mm-imx3.c

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/err.h>



#include <asm/pgtable.h>

#include <asm/system_misc.h>

#include <asm/hardware/cache-l2x0.h>

#include <asm/mach/map.h>