Linus Walleij ae0755b56d gpio: Fix up merge collision in include file ...

The merge of two different patch sets cleaning around in the
main driver include file collided making the function
declarations for gpiochip_[un]lock_as_irq() be defined twice
when gpiolib was unselected. Fix it up.

Cc: YueHaibing <yuehaibing@huawei.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

2019-09-05 11:20:25 +02:00

..

acpi

Merge tag 'docs-5.3' of git://git.lwn.net/linux

2019-07-09 12:34:26 -07:00

asm-generic

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

2019-07-17 13:13:41 -07:00

clocksource

clocksource/drivers: Continue making Hyper-V clocksource ISA agnostic

2019-07-03 11:00:59 +02:00

crypto

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2019-07-08 20:57:08 -07:00

drm

Merge tag 'drm-next-2019-07-19' of git://anongit.freedesktop.org/drm/drm

2019-07-19 12:29:43 -07:00

dt-bindings

Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

2019-07-19 17:19:24 -07:00

keys

Merge tag 'keys-request-20190626' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs

2019-07-08 19:19:37 -07:00

kvm

KVM: arm/arm64: Support chained PMU counters

2019-07-05 13:56:22 +01:00

linux

gpio: Fix up merge collision in include file

2019-09-05 11:20:25 +02:00

math-emu

…

media

Merge tag 'media/v5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2019-07-09 09:47:22 -07:00

misc

Merge tag 'powerpc-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

2019-07-13 16:08:36 -07:00

net

tcp: fix tcp_set_congestion_control() use from bpf hook

2019-07-18 20:33:48 -07:00

pcmcia

Merge tag 'docs-5.3' of git://git.lwn.net/linux

2019-07-09 12:34:26 -07:00

ras

…

rdma

RDMA/core: Make rdma_counter.h compile stand alone

2019-07-09 09:44:47 -03:00

scsi

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2019-07-20 10:04:58 -07:00

soc

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

2019-07-19 17:13:56 -07:00

sound

ALSA: hda - Don't resume forcibly i915 HDMI/DP codec

2019-07-16 22:46:13 +02:00

target

…

trace

Merge tag 'nfs-for-5.3-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

2019-07-18 14:32:33 -07:00

uapi

Merge tag 'drm-next-2019-07-19' of git://anongit.freedesktop.org/drm/drm

2019-07-19 12:29:43 -07:00

vdso

vdso: Remove superfluous #ifdef __KERNEL__ in vdso/datapage.h

2019-06-26 07:28:09 +02:00

video

Merge tag 'drm-next-2019-07-16' of git://anongit.freedesktop.org/drm/drm

2019-07-15 19:04:27 -07:00

xen

xen: remove tmem driver

2019-07-17 08:09:58 +02:00

Kbuild

kbuild: update compile-test header list for v5.3-rc1

2019-07-20 11:19:29 +09:00