diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-01-05 16:11:47 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-01-05 16:12:37 -0500 |
| commit | 71ebb396b7b0bd2f45034786fd4eb496cb1fccdd (patch) | |
| tree | 4c4d844c4d460051dfddd13764e624a7017aaa5d /net/unix/sysctl_net_unix.c | |
| parent | 5796e682e6495923b0fea0cf1f2b095520bc29ec (diff) | |
| parent | 8bb65fc06c08f027980a917648e1cf6e4d51c5ad (diff) | |
Merge commit '8bb65fc06c' into next/soc
This includes one fix from mainline to avoid introducing a build
regression after the pxa tree starts using gpio-reg:
drivers/gpio/gpio-reg.c:106:21: error: 'struct gpio_reg' has no member named 'irq'; did you mean 'irqs'?
drivers/gpio/gpio-reg.c:107:29: error: 'struct gpio_reg' has no member named 'irq'; did you mean 'irqs'?
* commit '8bb65fc06c':
gpio: gpio-reg: fix build
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'net/unix/sysctl_net_unix.c')
0 files changed, 0 insertions, 0 deletions