public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 2.6.15-git] alps: Add Fujitsu Siemens S6010 support to alps driver.
@ 2005-12-18  2:38 Ben Collins
  2005-12-18  3:59 ` Dmitry Torokhov
  0 siblings, 1 reply; 2+ messages in thread
From: Ben Collins @ 2005-12-18  2:38 UTC (permalink / raw)
  To: linux-kernel; +Cc: torvalds, akpm

PatchAuthor: andrew.waldrom@siemens.com
Reference: http://bugzilla.ubuntu.com/13404
    
Signed-off-by: Ben Collins <bcollins@ubuntu.com>

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index a80d6b9..3cffe1d 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -42,7 +42,7 @@ static struct alps_model_info alps_model
 	{ { 0x53, 0x02, 0x14 },	0xf8, 0xf8, 0 },
 	{ { 0x63, 0x02, 0x0a },	0xf8, 0xf8, 0 },
 	{ { 0x63, 0x02, 0x14 },	0xf8, 0xf8, 0 },
-	{ { 0x63, 0x02, 0x28 },	0xf8, 0xf8, 0 },
+	{ { 0x63, 0x02, 0x28 },	0xf8, 0xf8, ALPS_FW_BK_2 },		/* Fujitsu Siemens S6010 */
 	{ { 0x63, 0x02, 0x3c },	0x8f, 0x8f, ALPS_WHEEL },		/* Toshiba Satellite S2400-103 */
 	{ { 0x63, 0x02, 0x50 },	0xef, 0xef, ALPS_FW_BK_1 },		/* NEC Versa L320 */
 	{ { 0x63, 0x02, 0x64 },	0xf8, 0xf8, 0 },

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH 2.6.15-git] alps: Add Fujitsu Siemens S6010 support to alps driver.
  2005-12-18  2:38 [PATCH 2.6.15-git] alps: Add Fujitsu Siemens S6010 support to alps driver Ben Collins
@ 2005-12-18  3:59 ` Dmitry Torokhov
  0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2005-12-18  3:59 UTC (permalink / raw)
  To: Ben Collins; +Cc: linux-kernel, torvalds, akpm

On Saturday 17 December 2005 21:38, Ben Collins wrote:
> PatchAuthor: andrew.waldrom@siemens.com
> Reference: http://bugzilla.ubuntu.com/13404
>     
> Signed-off-by: Ben Collins <bcollins@ubuntu.com>
> 
> diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
> index a80d6b9..3cffe1d 100644
> --- a/drivers/input/mouse/alps.c
> +++ b/drivers/input/mouse/alps.c
> @@ -42,7 +42,7 @@ static struct alps_model_info alps_model
>  	{ { 0x53, 0x02, 0x14 },	0xf8, 0xf8, 0 },
>  	{ { 0x63, 0x02, 0x0a },	0xf8, 0xf8, 0 },
>  	{ { 0x63, 0x02, 0x14 },	0xf8, 0xf8, 0 },
> -	{ { 0x63, 0x02, 0x28 },	0xf8, 0xf8, 0 },
> +	{ { 0x63, 0x02, 0x28 },	0xf8, 0xf8, ALPS_FW_BK_2 },		/* Fujitsu Siemens S6010 */
>  	{ { 0x63, 0x02, 0x3c },	0x8f, 0x8f, ALPS_WHEEL },		/* Toshiba Satellite S2400-103 */
>  	{ { 0x63, 0x02, 0x50 },	0xef, 0xef, ALPS_FW_BK_1 },		/* NEC Versa L320 */
>  	{ { 0x63, 0x02, 0x64 },	0xf8, 0xf8, 0 },

This one is already in Linus's tree.

-- 
Dmitry

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2005-12-18  3:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-12-18  2:38 [PATCH 2.6.15-git] alps: Add Fujitsu Siemens S6010 support to alps driver Ben Collins
2005-12-18  3:59 ` Dmitry Torokhov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox