From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 30 May 2014 05:30:23 +0000 (+1000)
Subject: Merge remote-tracking branch 'tty/tty-next'
X-Git-Tag: next-20140530~21
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a1c4a33ebadb2b776ef66fdb3e8cde5bd1a8fd26;p=karo-tx-linux.git

Merge remote-tracking branch 'tty/tty-next'
---

a1c4a33ebadb2b776ef66fdb3e8cde5bd1a8fd26
diff --cc include/linux/platform_data/atmel.h
index 1466443797d7,cea9f70133c5..4b452c6a2f7b
--- a/include/linux/platform_data/atmel.h
+++ b/include/linux/platform_data/atmel.h
@@@ -84,9 -84,15 +84,8 @@@ struct atmel_uart_data 
  	short			use_dma_rx;	/* use receive DMA? */
  	void __iomem		*regs;		/* virt. base address, if any */
  	struct serial_rs485	rs485;		/* rs485 settings */
- 	int			rts_gpio;	/* optional RTS GPIO */
  };
  
 - /* Touchscreen Controller */
 -struct at91_tsadcc_data {
 -	unsigned int    adc_clock;
 -	u8		pendet_debounce;
 -	u8		ts_sample_hold_time;
 -};
 -
  /* CAN */
  struct at91_can_data {
  	void (*transceiver_switch)(int on);