Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes

2 files changed, 2 insertions, 1 deletions

diff --git a/include/linux/amba/pl022.h b/include/linux/amba/pl022.h
index fe1d7b283cb6..854b7294f6c6 100644
--- a/include/linux/amba/pl022.h
+++ b/include/linux/amba/pl022.h
@@ -244,6 +244,7 @@ struct dma_chan;
  *     indicates no delay and the device will be suspended immediately.
  * @rt: indicates the controller should run the message pump with realtime
  *     priority to minimise the transfer latency on the bus.
+ * @chipselects: list of <num_chipselects> chip select gpios
  */
 struct pl022_ssp_controller {
         u16 bus_id;
@@ -254,6 +255,7 @@ struct pl022_ssp_controller {
         void *dma_tx_param;
         int autosuspend_delay;
         bool rt;
+        int *chipselects;
 };
 
 /**
diff --git a/include/linux/amba/serial.h b/include/linux/amba/serial.h
index d117b29d1062..f612c783170f 100644
--- a/include/linux/amba/serial.h
+++ b/include/linux/amba/serial.h
@@ -205,7 +205,6 @@ struct amba_pl011_data {
         void *dma_tx_param;
         void (*init) (void);
         void (*exit) (void);
-        void (*reset) (void);
 };
 #endif