diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-03-02 11:59:16 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-03-02 12:04:16 +0000 |
commit | 6139dbbb7769c7251e04813f577454c6c9293e15 (patch) | |
tree | 588b44b4b8929caf812d440ec371331658fd7da3 /arch/arm/mach-omap1/board-nokia770.c | |
parent | [ARM] 4241/1: Define mb() as compiler barrier on a uniprocessor system (diff) | |
parent | ARM: OMAP: Add missing get_irqnr_preamble and arch_ret_to_user for omap2 (diff) | |
download | linux-dev-6139dbbb7769c7251e04813f577454c6c9293e15.tar.xz linux-dev-6139dbbb7769c7251e04813f577454c6c9293e15.zip |
Merge branch 'omap-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
Diffstat (limited to 'arch/arm/mach-omap1/board-nokia770.c')
-rw-r--r-- | arch/arm/mach-omap1/board-nokia770.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index cbe909bad79b..70014f751bc4 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c @@ -16,6 +16,8 @@ #include <linux/spi/spi.h> #include <linux/spi/ads7846.h> +#include <linux/workqueue.h> +#include <linux/delay.h> #include <asm/hardware.h> #include <asm/mach-types.h> @@ -103,7 +105,7 @@ static struct ads7846_platform_data nokia770_ads7846_platform_data __initdata = static struct spi_board_info nokia770_spi_board_info[] __initdata = { [0] = { - .modalias = "lcd_lph8923", + .modalias = "lcd_mipid", .bus_num = 2, .chip_select = 3, .max_speed_hz = 12000000, |