diff options
| author | Tobias Powalowski <tobias@T-POWA-LX.(none)> | 2010-04-04 09:35:38 +0200 |
|---|---|---|
| committer | Tobias Powalowski <tobias@T-POWA-LX.(none)> | 2010-04-04 09:35:38 +0200 |
| commit | 263dbbe2fb817716a5720090bce8d89194a16ad6 (patch) | |
| tree | 8b62949b54622261b84df6493f5f52d8048d1fda | |
| parent | 0923702fe9b5a7cfc3539906fb1ba9435b6e5e03 (diff) | |
bump to 2.6.33.2
| -rw-r--r-- | PATCHCFG | 7 | ||||
| -rw-r--r-- | patches/input-alps-add-support-for-the-touchpad-on-toshiba-tecra-a11-11l.patch | 25 |
2 files changed, 2 insertions, 30 deletions
@@ -10,7 +10,7 @@ SRCNAME="linux-2.6.33-ARCH" # filename%patchlevel (file must be in patches/ subdirectory) PATCHES=( # add upstream patch from 2.6.33 series - ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-2.6.33.1.bz2%1 + ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-2.6.33.2.bz2%1 # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git @@ -19,12 +19,9 @@ PATCHES=( # http://aufs.sourceforge.net aufs2-base-20100225.patch%1 aufs2-standalone-20100225.patch%1 - - # Trivial driver fixes: - input-alps-add-support-for-the-touchpad-on-toshiba-tecra-a11-11l.patch%1 ) # Name of the resulting patch (will be bzipped afterwards) -PATCHNAME="patch-2.6.33.1-1-ARCH" +PATCHNAME="patch-2.6.33.2-1-ARCH" # Run this before applying patches pre_apply() { diff --git a/patches/input-alps-add-support-for-the-touchpad-on-toshiba-tecra-a11-11l.patch b/patches/input-alps-add-support-for-the-touchpad-on-toshiba-tecra-a11-11l.patch deleted file mode 100644 index b12aee4..0000000 --- a/patches/input-alps-add-support-for-the-touchpad-on-toshiba-tecra-a11-11l.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Thomas Bächler <thomas@archlinux.org> -Date: Wed, 10 Mar 2010 04:38:48 +0000 (-0800) -Subject: Input: alps - add support for the touchpad on Toshiba Tecra A11-11L -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fdtor%2Finput.git;a=commitdiff_plain;h=eb8bff85c5bd5caef7c374ff32b86545029efb56 - -Input: alps - add support for the touchpad on Toshiba Tecra A11-11L - -Signed-off-by: Thomas Bächler <thomas@archlinux.org> -Cc: stable@kernel.org -Signed-off-by: Dmitry Torokhov <dtor@mail.ru> ---- - -diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c -index f93c2c0..f6dad83 100644 ---- a/drivers/input/mouse/alps.c -+++ b/drivers/input/mouse/alps.c -@@ -63,6 +63,8 @@ static const struct alps_model_info alps_model_data[] = { - { { 0x62, 0x02, 0x14 }, 0xcf, 0xcf, - ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED }, - { { 0x73, 0x02, 0x50 }, 0xcf, 0xcf, ALPS_FOUR_BUTTONS }, /* Dell Vostro 1400 */ -+ { { 0x52, 0x01, 0x14 }, 0xff, 0xff, -+ ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED }, /* Toshiba Tecra A11-11L */ - }; - - /* |