Skip to content

Commit bb6578b

Browse files
committed
Merge tag 'counter-fixes-for-6.5b' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter into char-misc-linus
William writes: Second set of Counter fixes for 6.5 The I8254 Kconfig entry is repositioned to resolve a misplacement causing the "Counter support" submenu items to disappear in menuconfig. The tools/counter/Makefile clean recipe is adjusted to replace rmdir with an equivalent set of rm to prevent failure if someone tries to clean the counter directory without building it first. * tag 'counter-fixes-for-6.5b' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter: tools/counter: Makefile: Replace rmdir by rm to avoid make,clean failure counter: Fix menuconfig "Counter support" submenu entries disappearance
2 parents ec3041b + aead781 commit bb6578b

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

tools/counter/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ $(OUTPUT)counter_example: $(COUNTER_EXAMPLE)
4040
clean:
4141
rm -f $(ALL_PROGRAMS)
4242
rm -rf $(OUTPUT)include/linux/counter.h
43-
rmdir -p $(OUTPUT)include/linux
43+
rm -df $(OUTPUT)include/linux
44+
rm -df $(OUTPUT)include
4445
find $(or $(OUTPUT),.) -name '*.o' -delete -o -name '\.*.d' -delete
4546

4647
install: $(ALL_PROGRAMS)

0 commit comments

Comments
 (0)