diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-20 23:04:40 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-20 23:04:40 -0800 |
| commit | fbac7d7d6c1f873c89d88ca6ab8a2891ac837796 (patch) | |
| tree | 7e5a205ff54f6a7416ffe3b5aad646092f78bee2 /include | |
| parent | 8a6ff8a0a2bc51b29681aab093b349c9eb32acf5 (diff) | |
| parent | 2abb74eaf6e73cb42e87bdc9e9c2535ce485e614 (diff) | |
| download | linux-3.10-fbac7d7d6c1f873c89d88ca6ab8a2891ac837796.tar.gz linux-3.10-fbac7d7d6c1f873c89d88ca6ab8a2891ac837796.tar.bz2 linux-3.10-fbac7d7d6c1f873c89d88ca6ab8a2891ac837796.zip | |
Merge tag 'at91-header' of git://github.com/at91linux/linux-at91 into next/headers
From Nicolas Ferre:
One fix related to UART for the "headers move" branch
* tag 'at91-header' of git://github.com/at91linux/linux-at91:
atmel: move ATMEL_MAX_UART to platform_data/atmel.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/platform_data/atmel.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/platform_data/atmel.h b/include/linux/platform_data/atmel.h index dbd6d53cc27..6a293b7fff3 100644 --- a/include/linux/platform_data/atmel.h +++ b/include/linux/platform_data/atmel.h @@ -19,6 +19,12 @@ #include <linux/serial.h> #include <linux/platform_data/macb.h> +/* + * at91: 6 USARTs and one DBGU port (SAM9260) + * avr32: 4 + */ +#define ATMEL_MAX_UART 7 + /* USB Device */ struct at91_udc_data { int vbus_pin; /* high == host powering us */ |