Merge bk://openembedded@openembedded.bkbits.net/packages-devel

into stealth.nexus.co.uk:/home/pb/oe/oe-packages

2004/11/14 17:30:11+00:00 nexus.co.uk!pb
enable vt1211 sensor support

BKrev: 419796323WjvxhlkFqYg-5G4LJf0Ug

diff --git a/linux/linux-epia-2.6.8.1/epia_defconfig b/linux/linux-epia-2.6.8.1/epia_defconfig
index 53202b6..7984e3c 100644 (file)
--- a/linux/linux-epia-2.6.8.1/epia_defconfig
+++ b/linux/linux-epia-2.6.8.1/epia_defconfig
@@ -880,7 +880,7 @@ CONFIG_I2C_ALGOBIT=m
 # CONFIG_I2C_ELEKTOR is not set
 # CONFIG_I2C_I801 is not set
 # CONFIG_I2C_I810 is not set
-# CONFIG_I2C_ISA is not set
+CONFIG_I2C_ISA=m
 # CONFIG_I2C_NFORCE2 is not set
 # CONFIG_I2C_PARPORT is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
@@ -898,7 +898,7 @@ CONFIG_I2C_VIAPRO=m
 #
 # Hardware Sensors Chip support
 #
-# CONFIG_I2C_SENSOR is not set
+CONFIG_I2C_SENSOR=m
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1031 is not set
@@ -924,6 +924,7 @@ CONFIG_I2C_VIAPRO=m
 # Other I2C Chip support
 #
 # CONFIG_SENSORS_EEPROM is not set
+CONFIG_SENSORS_VT1211=m
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_RTC8564 is not set

diff --git a/linux/linux-epia_2.6.8.1.oe b/linux/linux-epia_2.6.8.1.oe
index 800348d..c1fdc26 100644 (file)
--- a/linux/linux-epia_2.6.8.1.oe
+++ b/linux/linux-epia_2.6.8.1.oe
@@ -1,10 +1,11 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for VIA EPiA"
 LICENSE = "GPL"
-PR = "r13"
+PR = "r14"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
           http://www.epiawiki.org/files/epia_kernel/patch-2.6.8.1-epia1.bz2;patch=1 \
+          http://hem.bredband.net/ekmlar/patch-vt1211-2.6.txt;patch=1 \
            file://epia_defconfig"
 S = "${WORKDIR}/linux-${PV}"