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

1 files changed, 6 insertions, 0 deletions

diff --git a/include/linux/platform_data/atmel.h b/include/linux/platform_data/atmel.h
index dbd6d53cc270..6a293b7fff3b 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 */