diff options
| author | Greg Kroah-Hartman <[email protected]> | 2018-12-03 07:53:39 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2018-12-03 07:53:39 +0100 |
| commit | 44c94100b6fa83488337fe639eb7baba7dd93a91 (patch) | |
| tree | ffc60bdfe3a3f2f20359d2a7df8389f3ecf51d82 /include/linux/platform_data | |
| parent | 77df6d8d7298fd3fae12a646fd368fdcdb86152c (diff) | |
| parent | 2595646791c319cadfdbf271563aac97d0843dc7 (diff) | |
Merge 4.20-rc5 into usb-next
We need the USB fixes into usb-next.
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/gpio-davinci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/platform_data/gpio-davinci.h b/include/linux/platform_data/gpio-davinci.h index f92a47e18034..a93841bfb9f7 100644 --- a/include/linux/platform_data/gpio-davinci.h +++ b/include/linux/platform_data/gpio-davinci.h @@ -17,6 +17,8 @@ #define __DAVINCI_GPIO_PLATFORM_H struct davinci_gpio_platform_data { + bool no_auto_base; + u32 base; u32 ngpio; u32 gpio_unbanked; }; |