Skip to content

Commit f720c55

Browse files
committed
Move drivers to drivers/platform/x86
Moved thinkpad_ec.h, thinkpad_ec.c and smapi.c to drivers/platform/x86/
1 parent 9874125 commit f720c55

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ KBUILD := $(KBASE)/build
88
MOD_DIR := $(KBASE)/kernel
99
PWD := $(shell pwd)
1010
IDIR := include/linux
11-
TP_DIR := drivers/misc
11+
TP_DIR := drivers/platform/x86
1212
TP_MODULES := thinkpad_ec.o tp_smapi.o
1313
SHELL := /bin/bash
1414

@@ -105,8 +105,8 @@ patch: $(KSRC)
105105
\
106106
if [ "$(BASE_IN_PATCH)" == 1 ]; then \
107107
cp $(PWD)/thinkpad_ec.c $(NEW)/$(TP_DIR)/thinkpad_ec.c &&\
108-
cp $(PWD)/thinkpad_ec.h $(NEW)/$(IDIR)/thinkpad_ec.h &&\
109-
perl -i -pe 'print `cat $(PWD)/diff/Kconfig-thinkpad_ec.add` if m/^(endmenu|endif # MISC_DEVICES)$$/' $(NEW)/$(TP_DIR)/Kconfig &&\
108+
cp $(PWD)/thinkpad_ec.h $(NEW)/$(TP_DIR)/thinkpad_ec.h &&\
109+
perl -i -pe 'print `cat $(PWD)/diff/Kconfig-thinkpad_ec.add` if m/^(endmenu|endif # X86_PLATFORM_DEVICES)$$/' $(NEW)/$(TP_DIR)/Kconfig &&\
110110
sed -i -e '$$aobj-$$(CONFIG_THINKPAD_EC) += thinkpad_ec.o' $(NEW)/$(TP_DIR)/Makefile \
111111
; fi &&\
112112
\
@@ -117,7 +117,7 @@ patch: $(KSRC)
117117
\
118118
if [ "$(SMAPI_IN_PATCH)" == 1 ]; then \
119119
sed -i -e '$$aobj-$$(CONFIG_TP_SMAPI) += tp_smapi.o' $(NEW)/$(TP_DIR)/Makefile &&\
120-
perl -i -pe 'print `cat $(PWD)/diff/Kconfig-tp_smapi.add` if m/^(endmenu|endif # MISC_DEVICES)$$/' $(NEW)/$(TP_DIR)/Kconfig &&\
120+
perl -i -pe 'print `cat $(PWD)/diff/Kconfig-tp_smapi.add` if m/^(endmenu|endif # X86_PLATFORM_DEVICES)$$/' $(NEW)/$(TP_DIR)/Kconfig &&\
121121
cp $(PWD)/tp_smapi.c $(NEW)/$(TP_DIR)/tp_smapi.c &&\
122122
mkdir -p $(NEW)/Documentation &&\
123123
perl -0777 -pe 's/\n(Installation\n---+|Conflict with HDAPS\n---+|Files in this package\n---+|Setting and getting CD-ROM speed:\n).*?\n(?=[^\n]*\n-----)/\n/gs' $(PWD)/README > $(NEW)/Documentation/tp_smapi.txt \

0 commit comments

Comments
 (0)