diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-24 23:08:54 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-24 23:08:54 +0100 |
| commit | f949c0edd84101bfd30b3e7389c1a12b067e561d (patch) | |
| tree | ba39033c089a66a8d4ac058f3f03a8ed2a488f91 /arch/arm/mach-msm | |
| parent | 119c4b1257e44d9ec981465ccb80aba427a96dda (diff) | |
| parent | 92d2040d78f662f634efce7a5106bbed70b8708b (diff) | |
| download | kernel_samsung_smdk4412-f949c0edd84101bfd30b3e7389c1a12b067e561d.zip kernel_samsung_smdk4412-f949c0edd84101bfd30b3e7389c1a12b067e561d.tar.gz kernel_samsung_smdk4412-f949c0edd84101bfd30b3e7389c1a12b067e561d.tar.bz2 | |
Merge branch 'master' into devel
Diffstat (limited to 'arch/arm/mach-msm')
| -rw-r--r-- | arch/arm/mach-msm/board-msm7x27.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-msm/board-msm7x30.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-msm/board-qsd8x50.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-msm/board-msm7x27.c b/arch/arm/mach-msm/board-msm7x27.c index cccb9f3..db9381b 100644 --- a/arch/arm/mach-msm/board-msm7x27.c +++ b/arch/arm/mach-msm/board-msm7x27.c @@ -20,7 +20,6 @@ #include <linux/input.h> #include <linux/io.h> #include <linux/delay.h> -#include <linux/bootmem.h> #include <linux/power_supply.h> #include <mach/hardware.h> diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c index bac1f3c..e329819 100644 --- a/arch/arm/mach-msm/board-msm7x30.c +++ b/arch/arm/mach-msm/board-msm7x30.c @@ -20,7 +20,6 @@ #include <linux/gpio.h> #include <linux/platform_device.h> #include <linux/delay.h> -#include <linux/bootmem.h> #include <linux/io.h> #include <linux/smsc911x.h> diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c index ec46066..e3cc807 100644 --- a/arch/arm/mach-msm/board-qsd8x50.c +++ b/arch/arm/mach-msm/board-qsd8x50.c @@ -19,7 +19,6 @@ #include <linux/irq.h> #include <linux/gpio.h> #include <linux/platform_device.h> -#include <linux/bootmem.h> #include <linux/delay.h> #include <asm/mach-types.h> |