summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-27 10:03:00 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-27 10:03:00 -0700
commit7a82323da3d21ea59a0509569fc5c7bc5aa7eed7 (patch)
treee1831a744561fed3a0316162d702d58fea9c85e9 /include
parentb0d8aa081bcb2d396a257ae5b3be8c1b3006bfa4 (diff)
parent3c26e17032e42cfbe606882288223ad6146e4c38 (diff)
downloadop-kernel-dev-7a82323da3d21ea59a0509569fc5c7bc5aa7eed7.zip
op-kernel-dev-7a82323da3d21ea59a0509569fc5c7bc5aa7eed7.tar.gz
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 'include')
-rw-r--r--include/asm-avr32/arch-at32ap/board.h10
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 893aa6d..e60e907 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);
OpenPOWER on IntegriCloud