diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2005-01-03 21:58:44 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2005-01-03 21:58:44 +0000 |
| commit | 447e0835b44781f3fb615eb642f227e04a23fc55 (patch) | |
| tree | 3bd2a28d2da65437d099052cbac135660cc9a87e /sys-apps/i2c/files | |
| parent | Stable on sparc (Manifest recommit) (diff) | |
| download | gentoo-2-447e0835b44781f3fb615eb642f227e04a23fc55.tar.gz gentoo-2-447e0835b44781f3fb615eb642f227e04a23fc55.tar.bz2 gentoo-2-447e0835b44781f3fb615eb642f227e04a23fc55.zip | |
Backport upstream CVS fix to allow lm-sensors-2.9.0 to play nice with 2.4 kernels.
Diffstat (limited to 'sys-apps/i2c/files')
| -rw-r--r-- | sys-apps/i2c/files/i2c-2.9.0.fix.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/sys-apps/i2c/files/i2c-2.9.0.fix.patch b/sys-apps/i2c/files/i2c-2.9.0.fix.patch new file mode 100644 index 000000000000..3cadae7ca322 --- /dev/null +++ b/sys-apps/i2c/files/i2c-2.9.0.fix.patch @@ -0,0 +1,60 @@ +--- i2c-2.9.0/kernel/Module.mk 8 Dec 2004 21:03:57 ++++ i2c-2.9.0.1/kernel/Module.mk 3 Jan 2005 17:08:11 +@@ -26,17 +26,21 @@ + # We will only include those modules which are not already built into this + # kernel. + KERNELTARGETS := ++KERNELINCLUDES := + ifneq ($(shell if grep -q '^CONFIG_I2C=y' $(LINUX)/.config; then echo 1; fi),1) + KERNELTARGETS += $(MODULE_DIR)/i2c-core.o ++KERNELINCLUDES += $(MODULE_DIR)/i2c.h $(MODULE_DIR)/i2c-id.h + endif + ifneq ($(shell if grep -q '^CONFIG_I2C_CHARDEV=y' $(LINUX)/.config; then echo 1; fi),1) + KERNELTARGETS += $(MODULE_DIR)/i2c-dev.o + endif + ifneq ($(shell if grep -q '^CONFIG_I2C_ALGOBIT=y' $(LINUX)/.config; then echo 1; fi),1) + KERNELTARGETS += $(MODULE_DIR)/i2c-algo-bit.o ++KERNELINCLUDES += $(MODULE_DIR)/i2c-algo-bit.h + endif + ifneq ($(shell if grep -q '^CONFIG_I2C_ALGOBITHS=y' $(LINUX)/.config; then echo 1; fi),1) + KERNELTARGETS += $(MODULE_DIR)/i2c-algo-biths.o ++KERNELINCLUDES += $(MODULE_DIR)/i2c-algo-biths.h + endif + ifneq ($(shell if grep -q '^CONFIG_I2C_PHILIPSPAR=y' $(LINUX)/.config; then echo 1; fi),1) + ifeq ($(shell if grep -q '^CONFIG_PARPORT=[my]' $(LINUX)/.config; then echo 1; fi),1) +@@ -51,13 +55,16 @@ + endif + ifneq ($(shell if grep -q '^CONFIG_I2C_ALGOPCF=y' $(LINUX)/.config; then echo 1; fi),1) + KERNELTARGETS += $(MODULE_DIR)/i2c-algo-pcf.o ++KERNELINCLUDES += $(MODULE_DIR)/i2c-algo-pcf.h + endif + # will not build outside kernel tree + ifneq ($(shell if grep -q '^CONFIG_I2C_ELEKTOR=y' $(LINUX)/.config; then echo 1; fi),1) + #KERNELTARGETS += $(MODULE_DIR)/i2c-elektor.o ++#KERNELINCLUDES += $(MODULE_DIR)/i2c-pcf8584.h + endif + ifneq ($(shell if grep -q '^CONFIG_I2C_PROC=y' $(LINUX)/.config; then echo 1; fi),1) + KERNELTARGETS += $(MODULE_DIR)/i2c-proc.o ++KERNELINCLUDES += $(MODULE_DIR)/i2c-proc.h + endif + ifneq ($(shell if grep -q '^CONFIG_I2C_PPORT=y' $(LINUX)/.config; then echo 1; fi),1) + KERNELTARGETS += $(MODULE_DIR)/i2c-pport.o +@@ -75,6 +82,7 @@ + # + #ifneq ($(shell if grep -q '^CONFIG_I2C_ALGO8XX=y' $(LINUX)/.config; then echo 1; fi),1) + #KERNELTARGETS += $(MODULE_DIR)/i2c-algo-8xx.o ++#KERNELINCLUDES += $(MODULE_DIR)/i2c-algo-8xx.h + #endif + #ifneq ($(shell if grep -q '^CONFIG_I2C_RPXLITE=y' $(LINUX)/.config; then echo 1; fi),1) + #KERNELTARGETS += $(MODULE_DIR)/i2c-rpx.o +@@ -103,6 +111,10 @@ + done ; \ + $(RMDIR) $(DESTDIR)$(MODPREF)/misc 2> /dev/null || true ; \ + fi ++ if [ -n "$(KERNELINCLUDES)" ] ; then \ ++ $(MKDIR) $(DESTDIR)$(LINUX_INCLUDE_DIR) ; \ ++ $(INSTALL) -m 644 $(KERNELINCLUDES) $(DESTDIR)$(LINUX_INCLUDE_DIR) ; \ ++ fi + install :: install-kernel + + clean-kernel: |