diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-21 00:16:30 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-21 00:16:30 -0400 |
| commit | b74aae9a2074e1caa2e40bf119f3a633f77c94e4 (patch) | |
| tree | ba465514cff017a3213e65556674c68be5db29f6 /include/linux/amba/serial.h | |
| parent | 5698bd757d55b1bb87edd1a9744ab09c142abfc2 (diff) | |
| parent | b97ba3ab4e8ec88164a47c98c91955e90ecd7c6a (diff) | |
Merge branch 'next/cleanup' into next/multiplatform
* next/cleanup: (358 commits)
ARM: tegra: harmony: fix ldo7 regulator-name
ARM: OMAP2+: Make omap4-keypad.h local
ARM: OMAP2+: Make l4_3xxx.h local
ARM: OMAP2+: Make l4_2xxx.h local
ARM: OMAP2+: Make l3_3xxx.h local
ARM: OMAP2+: Make l3_2xxx.h local
ARM: OMAP1: Move irda.h from plat to mach
ARM: OMAP2+: Make hdq1w.h local
ARM: OMAP2+: Make gpmc-smsc911x.h local
ARM: OMAP2+: Make gpmc-smc91x.h local
ARM: OMAP1: Move flash.h from plat to mach
ARM: OMAP2+: Make debug-devices.h local
ARM: OMAP1: Move board-voiceblue.h from plat to mach
ARM: OMAP1: Move board-sx1.h from plat to mach
ARM: OMAP2+: Make omap-wakeupgen.h local
ARM: OMAP2+: Make omap-secure.h local
ARM: OMAP2+: Make ctrl_module_wkup_44xx.h local
ARM: OMAP2+: Make ctrl_module_pad_wkup_44xx.h local
ARM: OMAP2+: Make ctrl_module_pad_core_44xx.h local
ARM: OMAP2+: Make ctrl_module_core_44xx.h local
...
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 | ||