diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
| commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
| tree | 8291998abd73055de6f487fafa174ee2a5d3afee /include/asm-avr32/arch-at32ap/board.h | |
| parent | 6edae708bf77e012d855a7e2c7766f211d234f4f (diff) | |
| parent | 3f0a6766e0cc5a577805732e5adb50a585c58175 (diff) | |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/asm-avr32/arch-at32ap/board.h')
| -rw-r--r-- | include/asm-avr32/arch-at32ap/board.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/asm-avr32/arch-at32ap/board.h b/include/asm-avr32/arch-at32ap/board.h index 1a7b07d436ff..9fd2e32f84b8 100644 --- a/include/asm-avr32/arch-at32ap/board.h +++ b/include/asm-avr32/arch-at32ap/board.h | |||
| @@ -30,11 +30,9 @@ struct spi_board_info; | |||
| 30 | struct platform_device * | 30 | struct platform_device * |
| 31 | at32_add_device_spi(unsigned int id, struct spi_board_info *b, unsigned int n); | 31 | at32_add_device_spi(unsigned int id, struct spi_board_info *b, unsigned int n); |
| 32 | 32 | ||
| 33 | struct lcdc_platform_data { | 33 | struct atmel_lcdfb_info; |
| 34 | unsigned long fbmem_start; | ||
| 35 | unsigned long fbmem_size; | ||
| 36 | }; | ||
| 37 | struct platform_device * | 34 | struct platform_device * |
| 38 | at32_add_device_lcdc(unsigned int id, struct lcdc_platform_data *data); | 35 | at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data, |
| 36 | unsigned long fbmem_start, unsigned long fbmem_len); | ||
| 39 | 37 | ||
| 40 | #endif /* __ASM_ARCH_BOARD_H */ | 38 | #endif /* __ASM_ARCH_BOARD_H */ |