git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
palm27x.c
diff --git
a/arch/arm/mach-pxa/palm27x.c
b/arch/arm/mach-pxa/palm27x.c
index
405b92a
..
72adb3a
100644
(file)
--- a/
arch/arm/mach-pxa/palm27x.c
+++ b/
arch/arm/mach-pxa/palm27x.c
@@
-22,6
+22,7
@@
#include <linux/power_supply.h>
#include <linux/usb/gpio_vbus.h>
#include <linux/regulator/max1586.h>
#include <linux/power_supply.h>
#include <linux/usb/gpio_vbus.h>
#include <linux/regulator/max1586.h>
+#include <linux/i2c/pxa-i2c.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@
-36,8
+37,6
@@
#include <mach/palmasoc.h>
#include <mach/palm27x.h>
#include <mach/palmasoc.h>
#include <mach/palm27x.h>
-#include <plat/i2c.h>
-
#include "generic.h"
#include "devices.h"
#include "generic.h"
#include "devices.h"
@@
-323,7
+322,7
@@
static struct platform_pwm_backlight_data palm27x_backlight_data = {
.pwm_id = 0,
.max_brightness = 0xfe,
.dft_brightness = 0x7e,
.pwm_id = 0,
.max_brightness = 0xfe,
.dft_brightness = 0x7e,
- .pwm_period_ns = 3500,
+ .pwm_period_ns = 3500
* 1024
,
.init = palm27x_backlight_init,
.notify = palm27x_backlight_notify,
.exit = palm27x_backlight_exit,
.init = palm27x_backlight_init,
.notify = palm27x_backlight_notify,
.exit = palm27x_backlight_exit,