diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-04 16:15:48 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-04 16:15:48 -0500 |
commit | 42270035c6550101f7dc742a630c2590dd2d3ae0 (patch) | |
tree | 7b3d198f01b5c4c6b64f4cedf747f729438b7247 /arch/arm/mach-omap1/board-nokia770.c | |
parent | 2c89a8d09f03bc569d3237d97e2293d67c36d75d (diff) | |
parent | 8d91cbad8e6fd5b37bf584740f134508709ba035 (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: (30 commits)
[ARM] Acorn: move the i2c bus driver into drivers/i2c
[ARM] ARM SCSI: Don't try to dma_map_sg too many scatterlist entries
[ARM] ARM FAS216: don't modify scsi_cmnd request_bufflen
[ARM] rtc-pcf8583: Final fixes for this RTC on RiscPC
[ARM] rtc-pcf8583: correct month and year offsets
[ARM] rtc-pcf8583: don't use BCD_TO_BIN/BIN_TO_BCD
[ARM] EBSA110: Work around build errors
[ARM] 4241/1: Define mb() as compiler barrier on a uniprocessor system
[ARM] 4239/1: S3C24XX: Update kconfig entries for PM
[ARM] 4238/1: S3C24XX: docs: update suspend and resume
[ARM] 4237/2: oprofile: Always allow backtraces on ARM
[ARM] Yet more asm/apm-emulation.h stuff
ARM: OMAP: Add missing get_irqnr_preamble and arch_ret_to_user for omap2
ARM: OMAP: Use linux/delay.h not asm/delay.h
ARM: OMAP: Remove obsolete alsa typedefs
ARM: OMAP: omap1510->15xx conversions needed for sx1
ARM: OMAP: Add missing includes to board-nokia770
ARM: OMAP: Workqueue changes for board-h4.c
ARM: OMAP: dmtimer.c omap1 register fix
ARM: OMAP: board-nokia770: correct lcd name
...
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 cbe909bad79..70014f751bc 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c | |||
@@ -16,6 +16,8 @@ | |||
16 | 16 | ||
17 | #include <linux/spi/spi.h> | 17 | #include <linux/spi/spi.h> |
18 | #include <linux/spi/ads7846.h> | 18 | #include <linux/spi/ads7846.h> |
19 | #include <linux/workqueue.h> | ||
20 | #include <linux/delay.h> | ||
19 | 21 | ||
20 | #include <asm/hardware.h> | 22 | #include <asm/hardware.h> |
21 | #include <asm/mach-types.h> | 23 | #include <asm/mach-types.h> |
@@ -103,7 +105,7 @@ static struct ads7846_platform_data nokia770_ads7846_platform_data __initdata = | |||
103 | 105 | ||
104 | static struct spi_board_info nokia770_spi_board_info[] __initdata = { | 106 | static struct spi_board_info nokia770_spi_board_info[] __initdata = { |
105 | [0] = { | 107 | [0] = { |
106 | .modalias = "lcd_lph8923", | 108 | .modalias = "lcd_mipid", |
107 | .bus_num = 2, | 109 | .bus_num = 2, |
108 | .chip_select = 3, | 110 | .chip_select = 3, |
109 | .max_speed_hz = 12000000, | 111 | .max_speed_hz = 12000000, |