diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-25 08:15:31 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-25 08:15:31 -0500 |
| commit | 52e04ea89da57274f0313d2bd73ba02f686cfdeb (patch) | |
| tree | 6ce5d086bcaea4cb534b3fcf6ba736eb48d582a4 /drivers/video/omap/lcd_ldp.c | |
| parent | 41116e926cb92292fa4fcbe888ae8133fa0038e6 (diff) | |
| parent | 8b90ca08821fee79e181bfcbc3bbd41ef5637136 (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'drivers/video/omap/lcd_ldp.c')
| -rw-r--r-- | drivers/video/omap/lcd_ldp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap/lcd_ldp.c b/drivers/video/omap/lcd_ldp.c index 5bb7f6f14601..0f5952cae85e 100644 --- a/drivers/video/omap/lcd_ldp.c +++ b/drivers/video/omap/lcd_ldp.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <linux/platform_device.h> | 25 | #include <linux/platform_device.h> |
| 26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 27 | #include <linux/i2c/twl4030.h> | 27 | #include <linux/i2c/twl.h> |
| 28 | 28 | ||
| 29 | #include <mach/gpio.h> | 29 | #include <mach/gpio.h> |
| 30 | #include <plat/mux.h> | 30 | #include <plat/mux.h> |
| @@ -59,7 +59,7 @@ | |||
| 59 | #define TWL4030_VPLL2_DEV_GRP 0x33 | 59 | #define TWL4030_VPLL2_DEV_GRP 0x33 |
| 60 | #define TWL4030_VPLL2_DEDICATED 0x36 | 60 | #define TWL4030_VPLL2_DEDICATED 0x36 |
| 61 | 61 | ||
| 62 | #define t2_out(c, r, v) twl4030_i2c_write_u8(c, r, v) | 62 | #define t2_out(c, r, v) twl_i2c_write_u8(c, r, v) |
| 63 | 63 | ||
| 64 | 64 | ||
| 65 | static int ldp_panel_init(struct lcd_panel *panel, | 65 | static int ldp_panel_init(struct lcd_panel *panel, |