r1338 - trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches

[Sven Luther]

Author: luther
Date: 2004-08-26 02:29:41 -0600 (Thu, 26 Aug 2004)
New Revision: 1338

Added:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/drivers-macintosh-adb-trackpad.dpatch
Removed:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-trackpad.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-4
Log:
renamed the trackpad patch to something more speaking.


Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-4
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-4	2004-08-26 08:24:59 UTC (rev 1337)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-4	2004-08-26 08:29:41 UTC (rev 1338)
@@ -5,6 +5,7 @@
 drivers-ide-dma-blacklist-toshiba
 drivers-input-hiddev-HIDIOCGUCODE
 drivers-input-psaux-hacks
+drivers-macintosh-adb-trackpad
 drivers-net-8139too-locking
 drivers-net-tg3-readd
 drivers-scsi_changer
@@ -44,4 +45,3 @@
 nfsd-subtreecheck-nostale
 shm-segment-count-fix
 modular-xfrm_tunnel
-powerpc-trackpad.dpatch

Copied: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/drivers-macintosh-adb-trackpad.dpatch (from rev 1335, trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-trackpad.dpatch)

Deleted: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-trackpad.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-trackpad.dpatch	2004-08-26 08:24:59 UTC (rev 1337)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-trackpad.dpatch	2004-08-26 08:29:41 UTC (rev 1338)
@@ -1,26 +0,0 @@
-#! /bin/sh -e 
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: disable spurious 2nd mouse event for apple trackpads.
-## DP: Patch author: Alex Clausen
-## DP: Upstream status: reviewed by benh, will be submitted upstream.
-## DP: Please - it's a one-line patch that can definitely be applied since there
-## DP: wasn't ever any Apple with more than one mouse button, much less with a
-## DP: trackpad sporting multiple buttons. Did I forget to mention there wasn't
-## DP: any use of ADB outside of Apple hardware?s
-## DP: Michael Schmitz <schmitz@opal.biophys.uni-duesseldorf.de>
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
---- drivers/macintosh/adbhid.c.orig	2004-03-10 23:41:43.000000000 +0100
-+++ drivers/macintosh/adbhid.c		2004-03-10 23:41:34.000000000 +0100
-@@ -327,7 +327,7 @@
- 	input_report_key(&adbhid[id]->input, BTN_LEFT,   !((data[1] >> 7) & 1));
- 	input_report_key(&adbhid[id]->input, BTN_MIDDLE, !((data[2] >> 7) & 1));
-
--	if (nb >= 4)
-+	if (nb >= 4 && adbhid[id]->mouse_kind != ADBMOUSE_TRACKPAD)
- 		input_report_key(&adbhid[id]->input, BTN_RIGHT,  !((data[3] >> 7) & 1));
-
- 	input_report_rel(&adbhid[id]->input, REL_X,