From 5c3804629e69bf48474bb53038d5dcc5a8d25959 Mon Sep 17 00:00:00 2001
From: Eric Miao <eric.y.miao@gmail.com>
Date: Wed, 16 Dec 2009 16:41:30 +0800
Subject: revert "[ARM] pxa/cm-x300: add PWM backlight support"

Commit db205463fd24c0972ad2c4e4fafb1c76e51b4380 was incorrectly applied,
and reverted here to re-apply.

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
---
 arch/arm/mach-pxa/devices.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'arch/arm/mach-pxa/devices.c')

diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c
index 3395463bb5a..d4cc41d04b2 100644
--- a/arch/arm/mach-pxa/devices.c
+++ b/arch/arm/mach-pxa/devices.c
@@ -4,7 +4,6 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 
-#include <mach/hardware.h>
 #include <mach/udc.h>
 #include <mach/pxafb.h>
 #include <mach/mmc.h>
-- 
cgit v1.2.3


From 75e874c698bf7aeed005acd74d0fb13c47124939 Mon Sep 17 00:00:00 2001
From: Eric Miao <eric.y.miao@gmail.com>
Date: Wed, 16 Dec 2009 21:35:52 +0800
Subject: [ARM] pxa: fix no reference of cpu_is_pxa25x() in devices.c

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
---
 arch/arm/mach-pxa/devices.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'arch/arm/mach-pxa/devices.c')

diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c
index d4cc41d04b2..8e10db148f1 100644
--- a/arch/arm/mach-pxa/devices.c
+++ b/arch/arm/mach-pxa/devices.c
@@ -13,6 +13,7 @@
 #include <mach/pxa2xx_spi.h>
 #include <mach/camera.h>
 #include <mach/audio.h>
+#include <mach/hardware.h>
 #include <plat/i2c.h>
 #include <plat/pxa3xx_nand.h>
 
-- 
cgit v1.2.3