diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-03 21:22:31 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-03 21:22:46 +0000 |
| commit | 1fc3eb81100c3f3cd44e706e54390151b0f1ce74 (patch) | |
| tree | 922f64310caa55a3b417958a1c256a96f47c4b66 /arch/arm/plat-samsung | |
| parent | e006d6563bca989aeae1bc5ebc03dacdf5e15b32 (diff) | |
| parent | ee9ba0f2fd5819e377cdec974a2022a7af02a385 (diff) | |
| download | blackbird-obmc-linux-1fc3eb81100c3f3cd44e706e54390151b0f1ce74.tar.gz blackbird-obmc-linux-1fc3eb81100c3f3cd44e706e54390151b0f1ce74.zip | |
Merge branch 'imx/board' into next/boards
* imx/board: (4 commits)
Enable 32 bit flash support for iMX21ADS board
ARM: mx31pdk: Add MC13783 RTC support
iomux-mx25: configuration to support CSPI3 on CSI pins
MX1:apf9328: Add i2c support
Updated to v3.2-rc6, conflicts:
arch/arm/kernel/setup.c
Diffstat (limited to 'arch/arm/plat-samsung')
| -rw-r--r-- | arch/arm/plat-samsung/dev-backlight.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/plat-samsung/dev-backlight.c b/arch/arm/plat-samsung/dev-backlight.c index e657305644cc..a976c023b286 100644 --- a/arch/arm/plat-samsung/dev-backlight.c +++ b/arch/arm/plat-samsung/dev-backlight.c @@ -15,7 +15,6 @@ #include <linux/slab.h> #include <linux/io.h> #include <linux/pwm_backlight.h> -#include <linux/slab.h> #include <plat/devs.h> #include <plat/gpio-cfg.h> |
