diff options
| author | Linus Torvalds | 2007-05-17 06:20:28 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2007-05-17 06:20:28 +0200 |
| commit | 36dbe4d6bffb90fcb2663ac50af00a942412e246 (patch) | |
| tree | 4d24a2165620fa8fad0454299a8f5412555bba61 /include/asm-avr32/arch-at32ap/board.h | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| parent | [AVR32] Implement platform hooks for atmel_lcdfb driver (diff) | |
| download | kernel-qcow2-linux-36dbe4d6bffb90fcb2663ac50af00a942412e246.tar.gz kernel-qcow2-linux-36dbe4d6bffb90fcb2663ac50af00a942412e246.tar.xz kernel-qcow2-linux-36dbe4d6bffb90fcb2663ac50af00a942412e246.zip | |
Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32
* 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32:
[AVR32] Implement platform hooks for atmel_lcdfb driver
[AVR32] Wire up signalfd, timerfd and eventfd
[AVR32] optimize pagefault path
[AVR32] Remove bogus comment in arch/avr32/kernel/irq.c
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; struct platform_device * at32_add_device_spi(unsigned int id, struct spi_board_info *b, unsigned int n); -struct lcdc_platform_data { - unsigned long fbmem_start; - unsigned long fbmem_size; -}; +struct atmel_lcdfb_info; struct platform_device * -at32_add_device_lcdc(unsigned int id, struct lcdc_platform_data *data); +at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data, + unsigned long fbmem_start, unsigned long fbmem_len); #endif /* __ASM_ARCH_BOARD_H */ |