diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-27 10:03:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-27 10:03:00 -0700 |
| commit | 7a82323da3d21ea59a0509569fc5c7bc5aa7eed7 (patch) | |
| tree | e1831a744561fed3a0316162d702d58fea9c85e9 /include | |
| parent | Merge branch 'kvm-updates-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm (diff) | |
| parent | avr32: some mmc/sd cleanups (diff) | |
| download | linux-dev-7a82323da3d21ea59a0509569fc5c7bc5aa7eed7.tar.xz linux-dev-7a82323da3d21ea59a0509569fc5c7bc5aa7eed7.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
avr32: some mmc/sd cleanups
include/video/atmel_lcdc.h must #include <linux/workqueue.h>
avr32: allow system timer to share interrupt to make OProfile work
drivers/misc/atmel-ssc.c: Removed duplicated include
avr32: Add platform data for AC97C platform device
avr32: clean up mci platform code
fix avr32 build errors
Diffstat (limited to '')
| -rw-r--r-- | include/asm-avr32/arch-at32ap/board.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/asm-avr32/arch-at32ap/board.h b/include/asm-avr32/arch-at32ap/board.h index 893aa6d0cd11..e60e9076544d 100644 --- a/include/asm-avr32/arch-at32ap/board.h +++ b/include/asm-avr32/arch-at32ap/board.h @@ -82,7 +82,15 @@ struct mci_platform_data; struct platform_device * at32_add_device_mci(unsigned int id, struct mci_platform_data *data); -struct platform_device *at32_add_device_ac97c(unsigned int id); +struct ac97c_platform_data { + unsigned short dma_rx_periph_id; + unsigned short dma_tx_periph_id; + unsigned short dma_controller_id; + int reset_pin; +}; +struct platform_device * +at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data); + struct platform_device *at32_add_device_abdac(unsigned int id); struct platform_device *at32_add_device_psif(unsigned int id); |