diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
| commit | 53279f36dccffc26ff536003fd6bb97cc21c3b82 (patch) | |
| tree | 9d16e497c0e4158c7c054c479bd0e9ff0388d7bb /include/linux/amba/serial.h | |
| parent | a6e8c0a25377e27958b11b20e1927885ae7c9857 (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes
Diffstat (limited to 'include/linux/amba/serial.h')
| -rw-r--r-- | include/linux/amba/serial.h | 1 |
1 files changed, 0 insertions, 1 deletions
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 { | |||
| 205 | void *dma_tx_param; | 205 | void *dma_tx_param; |
| 206 | void (*init) (void); | 206 | void (*init) (void); |
| 207 | void (*exit) (void); | 207 | void (*exit) (void); |
| 208 | void (*reset) (void); | ||
| 209 | }; | 208 | }; |
| 210 | #endif | 209 | #endif |
| 211 | 210 | ||