diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-07 02:36:12 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-07 02:36:12 -0400 |
| commit | 5e2aa2ed08e2e280121dc7cf5609c87d464f12ef (patch) | |
| tree | ca7d7b1480285e3b617fecc5b41f0ce150a82c32 /include/linux/mfd/rdc321x.h | |
| parent | f62d14a8072b9756db36ba394e2b267470a40240 (diff) | |
| parent | fc8104bc5a3f6f49d79f45f2706f79f77a9fb2ae (diff) | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.17.
Diffstat (limited to 'include/linux/mfd/rdc321x.h')
| -rw-r--r-- | include/linux/mfd/rdc321x.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mfd/rdc321x.h b/include/linux/mfd/rdc321x.h index 4bdf19c8eedf..442743a8f915 100644 --- a/include/linux/mfd/rdc321x.h +++ b/include/linux/mfd/rdc321x.h | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #define RDC321X_GPIO_CTRL_REG2 0x84 | 12 | #define RDC321X_GPIO_CTRL_REG2 0x84 |
| 13 | #define RDC321X_GPIO_DATA_REG2 0x88 | 13 | #define RDC321X_GPIO_DATA_REG2 0x88 |
| 14 | 14 | ||
| 15 | #define RDC321X_MAX_GPIO 58 | 15 | #define RDC321X_NUM_GPIO 59 |
| 16 | 16 | ||
| 17 | struct rdc321x_gpio_pdata { | 17 | struct rdc321x_gpio_pdata { |
| 18 | struct pci_dev *sb_pdev; | 18 | struct pci_dev *sb_pdev; |