diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-24 18:08:54 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-24 18:08:54 -0400 |
| commit | f949c0edd84101bfd30b3e7389c1a12b067e561d (patch) | |
| tree | ba39033c089a66a8d4ac058f3f03a8ed2a488f91 /arch/arm/mach-msm/board-msm7x27.c | |
| parent | 119c4b1257e44d9ec981465ccb80aba427a96dda (diff) | |
| parent | 92d2040d78f662f634efce7a5106bbed70b8708b (diff) | |
Merge branch 'master' into devel
Diffstat (limited to 'arch/arm/mach-msm/board-msm7x27.c')
| -rw-r--r-- | arch/arm/mach-msm/board-msm7x27.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/board-msm7x27.c b/arch/arm/mach-msm/board-msm7x27.c index cccb9f3c9d01..db9381b85bf0 100644 --- a/arch/arm/mach-msm/board-msm7x27.c +++ b/arch/arm/mach-msm/board-msm7x27.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <linux/input.h> | 20 | #include <linux/input.h> |
| 21 | #include <linux/io.h> | 21 | #include <linux/io.h> |
| 22 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
| 23 | #include <linux/bootmem.h> | ||
| 24 | #include <linux/power_supply.h> | 23 | #include <linux/power_supply.h> |
| 25 | 24 | ||
| 26 | #include <mach/hardware.h> | 25 | #include <mach/hardware.h> |