diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/gpio/mc33880.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/gpio/mc33880.c')
| -rw-r--r-- | drivers/gpio/mc33880.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/mc33880.c b/drivers/gpio/mc33880.c index 00f6d24c669d..4ec797593bdb 100644 --- a/drivers/gpio/mc33880.c +++ b/drivers/gpio/mc33880.c | |||
| @@ -45,7 +45,7 @@ | |||
| 45 | * To save time we cache them here in memory | 45 | * To save time we cache them here in memory |
| 46 | */ | 46 | */ |
| 47 | struct mc33880 { | 47 | struct mc33880 { |
| 48 | struct mutex lock; /* protect from simultanous accesses */ | 48 | struct mutex lock; /* protect from simultaneous accesses */ |
| 49 | u8 port_config; | 49 | u8 port_config; |
| 50 | struct gpio_chip chip; | 50 | struct gpio_chip chip; |
| 51 | struct spi_device *spi; | 51 | struct spi_device *spi; |