Skip to content

Commit 9874125

Browse files
committed
hdaps.c is moved in recent kernels
Since some time (2.6.38?) hdaps.c is in drivers/platform/x86/ and not in drivers/hwmon/
1 parent 36d9887 commit 9874125

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ install: modules
7373
rm -f $(MOD_DIR)/drivers/firmware/{thinkpad_ec,tp_smapi,tp_base}.ko
7474
rm -f $(MOD_DIR)/extra/{thinkpad_ec,tp_smapi,tp_base}.ko
7575
ifeq ($(HDAPS),1)
76-
rm -f $(MOD_DIR)/drivers/hwmon/hdaps.ko
76+
rm -f $(MOD_DIR)/drivers/platform/x86/hdaps.ko
7777
rm -f $(MOD_DIR)/extra/hdaps.ko
7878
endif
7979
$(MAKE) -C $(KBUILD) M=$(PWD) O=$(KBUILD) modules_install
@@ -98,9 +98,9 @@ patch: $(KSRC)
9898
cd $$TMPDIR &&\
9999
mkdir -p $(ORG)/$(TP_DIR) &&\
100100
mkdir -p $(ORG)/$(IDIR) &&\
101-
mkdir -p $(ORG)/drivers/hwmon &&\
101+
mkdir -p $(ORG)/drivers/platform/x86 &&\
102102
cp $(KSRC)/$(TP_DIR)/{Kconfig,Makefile} $(ORG)/$(TP_DIR) &&\
103-
cp $(KSRC)/drivers/hwmon/{Kconfig,hdaps.c} $(ORG)/drivers/hwmon/ &&\
103+
cp $(KSRC)/drivers/platform/x86/{Kconfig,hdaps.c} $(ORG)/drivers/platform/x86/ &&\
104104
cp -r $(ORG) $(NEW) &&\
105105
\
106106
if [ "$(BASE_IN_PATCH)" == 1 ]; then \
@@ -111,8 +111,8 @@ patch: $(KSRC)
111111
; fi &&\
112112
\
113113
if [ "$(HDAPS_IN_PATCH)" == 1 ]; then \
114-
cp $(PWD)/hdaps.c $(NEW)/drivers/hwmon/ &&\
115-
perl -i -0777 -pe 's/(config SENSORS_HDAPS\n\ttristate [^\n]+\n\tdepends [^\n]+\n)/$$1\tselect THINKPAD_EC\n/' $(NEW)/drivers/hwmon/Kconfig \
114+
cp $(PWD)/hdaps.c $(NEW)/drivers/platform/x86/ &&\
115+
perl -i -0777 -pe 's/(config SENSORS_HDAPS\n\ttristate [^\n]+\n\tdepends [^\n]+\n)/$$1\tselect THINKPAD_EC\n/' $(NEW)/drivers/platform/x86/Kconfig \
116116
; fi &&\
117117
\
118118
if [ "$(SMAPI_IN_PATCH)" == 1 ]; then \

hdaps.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* drivers/hwmon/hdaps.c - driver for IBM's Hard Drive Active Protection System
2+
* drivers/platform/x86/hdaps.c - driver for IBM's Hard Drive Active Protection System
33
*
44
* Copyright (C) 2005 Robert Love <rml@novell.com>
55
* Copyright (C) 2005 Jesper Juhl <jesper.juhl@gmail.com>

0 commit comments

Comments
 (0)