diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-16 08:19:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-16 08:19:44 -0800 |
| commit | 8a03d9a498eaf02c8a118752050a5154852c13bf (patch) | |
| tree | 8e8fd8ce48892e667092aea6532548a4f79f9c25 /include/asm-avr32/arch-at32ap/board.h | |
| parent | f8abea8f8c24ecdad6d6861bffb912f23f2741cd (diff) | |
| parent | 41d8ca452f523b9245704c7dd8ef290fa7b78e6b (diff) | |
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] Use per-controller spi_board_info structures
[AVR32] Warn, don't BUG if clk_disable is called too many times
[AVR32] Make sure all genclocks have a parent
[AVR32] Remove unnecessary sys_nfsservctl conditional
[AVR32] Wire up the SysV IPC calls properly
[AVR32] Define ioremap_nocache, ioport_map and ioport_unmap
[AVR32] Fix prototypes for __raw_writesb and friends
Diffstat (limited to 'include/asm-avr32/arch-at32ap/board.h')
| -rw-r--r-- | include/asm-avr32/arch-at32ap/board.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-avr32/arch-at32ap/board.h b/include/asm-avr32/arch-at32ap/board.h index b120ee030c86..1a7b07d436ff 100644 --- a/include/asm-avr32/arch-at32ap/board.h +++ b/include/asm-avr32/arch-at32ap/board.h @@ -26,7 +26,9 @@ struct eth_platform_data { struct platform_device * at32_add_device_eth(unsigned int id, struct eth_platform_data *data); -struct platform_device *at32_add_device_spi(unsigned int id); +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; |