Merge branch 'next' into for-linus

Merge first round of changes for 3.13 merge window.

1 files changed, 0 insertions, 3 deletions

diff --git a/include/linux/platform_data/serial-sccnxp.h b/include/linux/platform_data/serial-sccnxp.h
index bdc510d03245..af0c8c3b89ae 100644
--- a/include/linux/platform_data/serial-sccnxp.h
+++ b/include/linux/platform_data/serial-sccnxp.h
@@ -60,7 +60,6 @@
  * };
  *
  * static struct sccnxp_pdata sc2892_info = {
- *      .frequency      = 3686400,
  *      .mctrl_cfg[0]   = MCTRL_SIG(DIR_OP, LINE_OP0),
  *      .mctrl_cfg[1]   = MCTRL_SIG(DIR_OP, LINE_OP1),
  * };
@@ -78,8 +77,6 @@
 
 /* SCCNXP platform data structure */
 struct sccnxp_pdata {
-        /* Frequency (extrenal clock or crystal) */
-        int                     frequency;
         /* Shift for A0 line */
         const u8                reg_shift;
         /* Modem control lines configuration */