diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-08-21 14:20:37 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-21 14:20:37 +0000 |
commit | 0340ff10910d1daf161dc81ba6ffc85e47faa09b (patch) | |
tree | 6dfac79e184d221cd925de4703d55d99bc3a8d6d /drivers/tty/serial/mpc52xx_uart.c | |
parent | 6484c6ca6b91d1e2b107d296e7306de3f6e422b2 (diff) | |
parent | 74c41fb6f52268470b4552ca543515be210c71fb (diff) |
Merge branch 'testing/defconfig-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into testing/multiplatformtracking-multiplatform-llct-20120821.0
Conflicts:
arch/arm/mach-pxa/cm-x2xx.c
sound/soc/ux500/ux500_msp_dai.c
sound/soc/ux500/ux500_msp_i2s.c
sound/soc/ux500/ux500_msp_i2s.h
Diffstat (limited to 'drivers/tty/serial/mpc52xx_uart.c')
-rw-r--r-- | drivers/tty/serial/mpc52xx_uart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/mpc52xx_uart.c b/drivers/tty/serial/mpc52xx_uart.c index bedac0d4c9ce..b131f2d885d4 100644 --- a/drivers/tty/serial/mpc52xx_uart.c +++ b/drivers/tty/serial/mpc52xx_uart.c @@ -598,7 +598,7 @@ static struct psc_ops mpc512x_psc_ops = { }; #endif -static struct psc_ops *psc_ops; +static const struct psc_ops *psc_ops; /* ======================================================================== */ /* UART operations */ |