diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-28 15:06:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-28 15:06:00 -0400 |
| commit | 8b7231a9c76a321ecf907c1c7beaa8ce1aad3be0 (patch) | |
| tree | 4f5f771f66a9b223b116742a8a04019cad287a4f /arch | |
| parent | 93416253073511716f7e70c06e32c3810c3deac4 (diff) | |
| parent | e0fb8c418520b41d57667befdb8861c46cdf69e0 (diff) | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-vexpress/ct-ca9x4.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c index e6f73030d5f0..9b11eedba65f 100644 --- a/arch/arm/mach-vexpress/ct-ca9x4.c +++ b/arch/arm/mach-vexpress/ct-ca9x4.c | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | * Versatile Express Core Tile Cortex A9x4 Support | 2 | * Versatile Express Core Tile Cortex A9x4 Support |
| 3 | */ | 3 | */ |
| 4 | #include <linux/init.h> | 4 | #include <linux/init.h> |
| 5 | #include <linux/gfp.h> | ||
| 5 | #include <linux/device.h> | 6 | #include <linux/device.h> |
| 6 | #include <linux/dma-mapping.h> | 7 | #include <linux/dma-mapping.h> |
| 7 | #include <linux/platform_device.h> | 8 | #include <linux/platform_device.h> |