diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-03-15 10:24:32 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-03-15 10:24:32 +0000 |
| commit | 8229c885fe361e521ac64de36b16011e54a30de0 (patch) | |
| tree | 572e5d34b16713ddef9e803308c6f72014aff01b /drivers/gpio/gpio-lpc32xx.c | |
| parent | c3c50e8b651887bcefcc13beb3739c00b2379b5c (diff) | |
| parent | fde7d9049e55ab85a390be7f415d74c9f62dd0f9 (diff) | |
| download | talos-op-linux-8229c885fe361e521ac64de36b16011e54a30de0.tar.gz talos-op-linux-8229c885fe361e521ac64de36b16011e54a30de0.zip | |
drm: Merge tag 'v3.3-rc7' into drm-core-next
Merge the fixes so far into core-next, needed to test
intel driver.
Conflicts:
drivers/gpu/drm/i915/intel_ringbuffer.c
Diffstat (limited to 'drivers/gpio/gpio-lpc32xx.c')
| -rw-r--r-- | drivers/gpio/gpio-lpc32xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-lpc32xx.c b/drivers/gpio/gpio-lpc32xx.c index 5b6948081f8f..ddfacc5ce56d 100644 --- a/drivers/gpio/gpio-lpc32xx.c +++ b/drivers/gpio/gpio-lpc32xx.c @@ -96,7 +96,7 @@ static const char *gpio_p2_names[LPC32XX_GPIO_P2_MAX] = { }; static const char *gpio_p3_names[LPC32XX_GPIO_P3_MAX] = { - "gpi000", "gpio01", "gpio02", "gpio03", + "gpio00", "gpio01", "gpio02", "gpio03", "gpio04", "gpio05" }; |
