diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-09-05 03:17:31 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-09-05 03:17:31 -0400 |
| commit | 14e42917216ab0859827c2d8024df45a917301b4 (patch) | |
| tree | efbea5d1c54387d62a6fd66a21560232cf312fda /drivers/tty/serial/ifx6x60.c | |
| parent | 292f2b6254c9dbb98def6d3521b07a837545ead0 (diff) | |
| parent | 4266274836e81575ee82498d84f4bd08ab7a7378 (diff) | |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-next
Diffstat (limited to 'drivers/tty/serial/ifx6x60.c')
| -rw-r--r-- | drivers/tty/serial/ifx6x60.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c index 144cd3987d4c..3ad079ffd049 100644 --- a/drivers/tty/serial/ifx6x60.c +++ b/drivers/tty/serial/ifx6x60.c | |||
| @@ -1331,7 +1331,7 @@ static const struct spi_device_id ifx_id_table[] = { | |||
| 1331 | MODULE_DEVICE_TABLE(spi, ifx_id_table); | 1331 | MODULE_DEVICE_TABLE(spi, ifx_id_table); |
| 1332 | 1332 | ||
| 1333 | /* spi operations */ | 1333 | /* spi operations */ |
| 1334 | static const struct spi_driver ifx_spi_driver = { | 1334 | static struct spi_driver ifx_spi_driver = { |
| 1335 | .driver = { | 1335 | .driver = { |
| 1336 | .name = DRVNAME, | 1336 | .name = DRVNAME, |
| 1337 | .pm = &ifx_spi_pm, | 1337 | .pm = &ifx_spi_pm, |