rpms/kernel/F-10 TODO, 1.44, 1.45 kernel.spec, 1.1129, 1.1130 linux-2.6-olpc-touchpad.patch, 1.1, 1.2

[Jeremy Katz]

Author: katzj

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22613

Modified Files:
	TODO kernel.spec linux-2.6-olpc-touchpad.patch 
Log Message:
* Mon Nov 10 2008 Jeremy Katz <katzj at redhat.com> 2.6.27.5-94
- Fix up bogons in OLPC touchpad patch
- Reduce error level of an mmc warning on boot for XO (#469159)



Index: TODO
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/TODO,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- TODO	9 Nov 2008 22:38:19 -0000	1.44
+++ TODO	10 Nov 2008 19:38:43 -0000	1.45
@@ -163,6 +163,8 @@
 	OLPC folks and then to upstream for .28
 linux-2.6-olpc-touchpad.patch
 	OLPC touchpad tweaks backported from 2.6.28
+linux-2.6-quieter-mmc.patch
+        Quiets a warning from the sdhci stack on boot on XO; en route upstream
 
 linux-2.6-x86-mtrr-kill-bogus-warning.patch
 	Silence bogus warning under vmware ; sent upstream.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1129
retrieving revision 1.1130
diff -u -r1.1129 -r1.1130
--- kernel.spec	10 Nov 2008 18:42:43 -0000	1.1129
+++ kernel.spec	10 Nov 2008 19:38:44 -0000	1.1130
@@ -687,6 +687,7 @@
 # olpc fixes
 Patch2040: linux-2.6-olpc-speaker-out.patch
 Patch2041: linux-2.6-olpc-touchpad.patch
+Patch2042: linux-2.6-quieter-mmc.patch
 
 # linux1394 git patches
 Patch2200: linux-2.6-firewire-git-update.patch
@@ -1282,6 +1283,7 @@
 
 ApplyPatch linux-2.6-olpc-speaker-out.patch
 ApplyPatch linux-2.6-olpc-touchpad.patch
+ApplyPatch linux-2.6-quieter-mmc.patch
 
 # Nouveau DRM + drm fixes
 ApplyPatch nvidia-agp.patch
@@ -1895,6 +1897,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Nov 10 2008 Jeremy Katz <katzj at redhat.com> 2.6.27.5-94
+- Fix up bogons in OLPC touchpad patch
+- Reduce error level of an mmc warning on boot for XO (#469159)
+
 * Mon Nov 10 2008 Dave Jones <davej at redhat.com> 2.6.27.5-93
 - Make UTF-8 the default for FAT/VFAT filesystems again.
 

linux-2.6-olpc-touchpad.patch:

Index: linux-2.6-olpc-touchpad.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-olpc-touchpad.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-olpc-touchpad.patch	5 Nov 2008 19:23:10 -0000	1.1
+++ linux-2.6-olpc-touchpad.patch	10 Nov 2008 19:38:45 -0000	1.2
@@ -397,7 +397,7 @@
 + */
 +static int hgpk_validate_byte(unsigned char *packet)
 +{
-+	return (packet[0] & 0x0C) == 0x08;
++	if (!(packet[0] & (1<<3)) || (packet[0] & (1<<2)))  { return -1; } else { return 0; }
 +}
 +
 +static void hgpk_process_packet(struct psmouse *psmouse)
@@ -542,8 +542,8 @@
 +		psmouse_reset(psmouse);
 +
 +		/* should be all set, enable the touchpad */
-+		ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_ENABLE);
-+		psmouse_set_state(psmouse, PSMOUSE_ACTIVATED);
++		//ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_ENABLE);
++		//psmouse_set_state(psmouse, PSMOUSE_ACTIVATED);
 +
 +	} else {
 +		hgpk_dbg(psmouse, "Powering off touchpad.\n");