diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-13 13:18:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-13 13:18:32 -0700 |
| commit | 84c48e6f43ae1771fc67fd8fcd777ff4b3b4465b (patch) | |
| tree | 3272373e763d8e3ba5f7d7b0a7e18cd16eb178a8 /arch/avr32/mach-at32ap/include/mach/board.h | |
| parent | 5c55b40b27bc3249358dcfc86c0845be409ab7a6 (diff) | |
| parent | bb6e647051a59dca5a72b3deef1e061d7c1c34da (diff) | |
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: Fix oops on unaligned user access
avr32: Add support for Mediama RMTx add-on board for ATNGW100
avr32: Change Atmel ATNGW100 config to add choice of add-on board
Fix MIMC200 board LCD init
avr32: Fix clash in ATMEL_USART_ flags
avr32: remove obsolete hw_interrupt_type
avr32: Solves problem with inverted MCI detect pin on Merisc board
atmel-mci: Add support for inverted detect pin
Diffstat (limited to 'arch/avr32/mach-at32ap/include/mach/board.h')
| -rw-r--r-- | arch/avr32/mach-at32ap/include/mach/board.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/mach-at32ap/include/mach/board.h b/arch/avr32/mach-at32ap/include/mach/board.h index 0b816428189..ddedb471f33 100644 --- a/arch/avr32/mach-at32ap/include/mach/board.h +++ b/arch/avr32/mach-at32ap/include/mach/board.h @@ -29,7 +29,7 @@ extern struct platform_device *atmel_default_console_device; /* Flags for selecting USART extra pins */ #define ATMEL_USART_RTS 0x01 #define ATMEL_USART_CTS 0x02 -#define ATMEL_USART_CLK 0x03 +#define ATMEL_USART_CLK 0x04 struct atmel_uart_data { short use_dma_tx; /* use transmit DMA? */ |