rpms/kernel/devel kernel.spec, 1.1574, 1.1575 via-hwmon-temp-sensor.patch, 1.2, 1.3 via-sdmmc.patch, 1.4, 1.5 via-padlock-10-enable-64bit.patch, 1.1, NONE via-padlock-20-add-x86-dependency.patch, 1.1, NONE via-rng-enable-64bit.patch, 1.1, NONE

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6471

Modified Files:
	kernel.spec via-hwmon-temp-sensor.patch via-sdmmc.patch 
Removed Files:
	via-padlock-10-enable-64bit.patch 
	via-padlock-20-add-x86-dependency.patch 
	via-rng-enable-64bit.patch 
Log Message:
Fix up the via-sdmmc and via-hwmon-temp-sensor patches.
Drop VIA Padlock patches merged upstream:
    via-rng-enable-64bit.patch
    via-padlock-10-enable-64bit.patch
    via-padlock-20-add-x86-dependency.patch


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1574
retrieving revision 1.1575
diff -u -p -r1.1574 -r1.1575
--- kernel.spec	18 Jun 2009 19:05:54 -0000	1.1574
+++ kernel.spec	19 Jun 2009 21:49:01 -0000	1.1575
@@ -672,11 +672,8 @@ Patch10000: linux-2.6-missing-rfc2465-st
 
 # VIA Nano / VX8xx updates
 Patch11010: via-hwmon-temp-sensor.patch
-Patch11020: via-padlock-10-enable-64bit.patch
-Patch11030: via-padlock-20-add-x86-dependency.patch
 Patch11050: via-padlock-40-nano-ecb.patch
 Patch11060: via-padlock-50-nano-cbc.patch
-Patch11070: via-rng-enable-64bit.patch
 Patch11080: via-sdmmc.patch
 
 %endif
@@ -1090,13 +1087,10 @@ ApplyPatch linux-2.6-sysrq-c.patch
 
 # Architecture patches
 # x86(-64)
-#ApplyPatch via-hwmon-temp-sensor.patch
-#ApplyPatch via-padlock-10-enable-64bit.patch
-#ApplyPatch via-padlock-20-add-x86-dependency.patch
+ApplyPatch via-hwmon-temp-sensor.patch
 ApplyPatch via-padlock-40-nano-ecb.patch
 ApplyPatch via-padlock-50-nano-cbc.patch
-#ApplyPatch via-rng-enable-64bit.patch
-#ApplyPatch via-sdmmc.patch
+ApplyPatch via-sdmmc.patch
 
 #
 # PowerPC
@@ -1823,6 +1817,13 @@ fi
 # and build.
 
 %changelog
+* Fri Jun 19 2009 Chuck Ebbert <cebbert at redhat.com>
+- Fix up the via-sdmmc and via-hwmon-temp-sensor patches.
+- Drop VIA Padlock patches merged upstream:
+    via-rng-enable-64bit.patch
+    via-padlock-10-enable-64bit.patch
+    via-padlock-20-add-x86-dependency.patch
+
 * Thu Jun 18 2009 Kyle McMartin <kyle at redhat.com> 2.6.31-0.11.rc0.git13
 - 2.6.30-git13
 - config changes:

via-hwmon-temp-sensor.patch:

Index: via-hwmon-temp-sensor.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/via-hwmon-temp-sensor.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- via-hwmon-temp-sensor.patch	12 Jun 2009 21:18:48 -0000	1.2
+++ via-hwmon-temp-sensor.patch	19 Jun 2009 21:49:01 -0000	1.3
@@ -8,7 +8,7 @@ Now at patch ../patches/2-linux-2.6-via.
 +++ work-2.6.29.4/drivers/hwmon/Kconfig
 @@ -720,6 +720,14 @@ config SENSORS_THMC50
  	  This driver can also be built as a module.  If so, the module
- 	  will be called thmc50.
+ 	  will be called tmp401.
  
 +config SENSORS_VIA_CPUTEMP
 +	tristate "VIA CPU temperature sensor"
@@ -24,9 +24,9 @@ Now at patch ../patches/2-linux-2.6-via.
 --- work-2.6.29.4.orig/drivers/hwmon/Makefile
 +++ work-2.6.29.4/drivers/hwmon/Makefile
 @@ -75,6 +75,7 @@ obj-$(CONFIG_SENSORS_SMSC47B397)+= smsc4
- obj-$(CONFIG_SENSORS_SMSC47M1)	+= smsc47m1.o
  obj-$(CONFIG_SENSORS_SMSC47M192)+= smsc47m192.o
  obj-$(CONFIG_SENSORS_THMC50)	+= thmc50.o
+ obj-$(CONFIG_SENSORS_TMP401)	+= tmp401.o
 +obj-$(CONFIG_SENSORS_VIA_CPUTEMP)+= via-cputemp.o
  obj-$(CONFIG_SENSORS_VIA686A)	+= via686a.o
  obj-$(CONFIG_SENSORS_VT1211)	+= vt1211.o

via-sdmmc.patch:

Index: via-sdmmc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/via-sdmmc.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- via-sdmmc.patch	17 Jun 2009 10:51:58 -0000	1.4
+++ via-sdmmc.patch	19 Jun 2009 21:49:01 -0000	1.5
@@ -28,9 +28,9 @@ Now at patch ../patches/10-linux-2.6-via
 --- work-2.6.29.4.orig/drivers/mmc/host/Kconfig
 +++ work-2.6.29.4/drivers/mmc/host/Kconfig
 @@ -212,3 +212,16 @@ config MMC_TMIO
- 	help
- 	  This provides support for the SD/MMC cell found in TC6393XB,
- 	  T7L66XB and also ipaq ASIC3
+ 	  This driver can also be built as a module. If so, the module
+ 	  will be called cb710-mmc.
+ 
 +
 +config MMC_VIA_SDMMC
 +	tristate "VIA SD/MMC Card Reader Driver"
@@ -46,12 +46,11 @@ Now at patch ../patches/10-linux-2.6-via
 +
 --- work-2.6.29.4.orig/drivers/mmc/host/Makefile
 +++ work-2.6.29.4/drivers/mmc/host/Makefile
-@@ -27,4 +27,5 @@ endif
- obj-$(CONFIG_MMC_S3C)   	+= s3cmci.o
- obj-$(CONFIG_MMC_SDRICOH_CS)	+= sdricoh_cs.o
- obj-$(CONFIG_MMC_TMIO)		+= tmio_mmc.o
+@@ -27,3 +27,4 @@ endif
+ ifeq ($(CONFIG_CB710_DEBUG),y)
+ 	CFLAGS-cb710-mmc	+= -DDEBUG
+ endif
 +obj-$(CONFIG_MMC_VIA_SDMMC)	+= via-sdmmc.o
- 
 --- /dev/null
 +++ work-2.6.29.4/drivers/mmc/host/via-sdmmc.c
 @@ -0,0 +1,1331 @@


--- via-padlock-10-enable-64bit.patch DELETED ---


--- via-padlock-20-add-x86-dependency.patch DELETED ---


--- via-rng-enable-64bit.patch DELETED ---