Commit 3d1e3649 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-fixes-for-v6.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux 

Pull gpio fixes from Bartosz Golaszewski:

 - fix GPIO submenu regression in Kconfig

 - fix make clean under tools/gpio/

* tag 'gpio-fixes-for-v6.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  tools: gpio: remove the include directory on make clean
  gpio: fix GPIO submenu in Kconfig
parents dd6cbcc5 ed42d80f

drivers/gpio/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ 
# GPIO infrastructure and drivers

#



config GPIOLIB_LEGACY

	def_bool y



menuconfig GPIOLIB

	bool "GPIO Support"

	help
@@ -12,9 +15,6 @@ menuconfig GPIOLIB 


	  If unsure, say N.



config GPIOLIB_LEGACY

	def_bool y



if GPIOLIB



config GPIOLIB_FASTPATH_LIMIT

tools/gpio/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ $(OUTPUT)gpio-watch: $(GPIO_WATCH_IN) 


clean:

	rm -f $(ALL_PROGRAMS)

	rm -f $(OUTPUT)include/linux/gpio.h

	rm -rf $(OUTPUT)include

	find $(or $(OUTPUT),.) -name '*.o' -delete -o -name '\.*.d' -delete -o -name '\.*.cmd' -delete



install: $(ALL_PROGRAMS)