Commit 8b7231a9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of ssh://master.kernel.org/~sfr/next-fixes 

* 'fixes' of ssh://master.kernel.org/~sfr/next-fixes:
  acpi: update gfp/slab.h includes
  ocfs2: update gfp/slab.h includes
  davinci: update gfp/slab.h includes
  arm: update gfp/slab.h includes
  v4l-dvb: update gfp/slab.h includes
parents 93416253 e0fb8c41

arch/arm/mach-vexpress/ct-ca9x4.c

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
 * Versatile Express Core Tile Cortex A9x4 Support

 */

#include <linux/init.h>

#include <linux/gfp.h>

#include <linux/device.h>

#include <linux/dma-mapping.h>

#include <linux/platform_device.h>

drivers/acpi/apei/apei-base.c

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

#include <linux/init.h>

#include <linux/acpi.h>

#include <linux/slab.h>

#include <linux/io.h>

#include <linux/kref.h>

#include <linux/rculist.h>

drivers/acpi/atomicio.c

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

#include <linux/rculist.h>

#include <linux/interrupt.h>

#include <linux/slab.h>

#include <acpi/atomicio.h>



#define ACPI_PFX "ACPI: "

drivers/rtc/rtc-davinci.c

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

#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/slab.h>



/*

 * The DaVinci RTC is a simple RTC with the following

drivers/staging/tm6000/tm6000-alsa.c

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

#include <linux/interrupt.h>

#include <linux/usb.h>

#include <linux/slab.h>



#include <asm/delay.h>

#include <sound/core.h>