diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/tty/serial/max3107.h | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/tty/serial/max3107.h')
| -rw-r--r-- | drivers/tty/serial/max3107.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/max3107.h b/drivers/tty/serial/max3107.h index 7ab63239250..8415fc723b9 100644 --- a/drivers/tty/serial/max3107.h +++ b/drivers/tty/serial/max3107.h | |||
| @@ -369,7 +369,7 @@ struct max3107_port { | |||
| 369 | struct spi_device *spi; | 369 | struct spi_device *spi; |
| 370 | 370 | ||
| 371 | #if defined(CONFIG_GPIOLIB) | 371 | #if defined(CONFIG_GPIOLIB) |
| 372 | /* GPIO chip stucture */ | 372 | /* GPIO chip structure */ |
| 373 | struct gpio_chip chip; | 373 | struct gpio_chip chip; |
| 374 | #endif | 374 | #endif |
| 375 | 375 | ||