Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d83561a4 authored by Ben Collins's avatar Ben Collins Committed by David S. Miller
Browse files

[IRDA]: add some IBM think pads 

[UBUNTU:nsc-ircc] Add some IBM think pads
Add Thinkpad T60/X60/Z60/T43/R52 Infrared driver support.

http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-dapper.git;a=commitdiff;h=7b8d2713435a9fb69719a282ba75e117f3f76a5b



Signed-off-by: default avatarBen Collins <bcollins@ubuntu.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
parent 1e4fd51e

drivers/net/irda/nsc-ircc.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -115,7 +115,11 @@ static nsc_chip_t chips[] = { 
	/* Contributed by Jan Frey - IBM A30/A31 */

	/* Contributed by Jan Frey - IBM A30/A31 */

	{ "PC8739x", { 0x2e, 0x4e, 0x0 }, 0x20, 0xea, 0xff, 

	{ "PC8739x", { 0x2e, 0x4e, 0x0 }, 0x20, 0xea, 0xff, 

	  nsc_ircc_probe_39x, nsc_ircc_init_39x },

	  nsc_ircc_probe_39x, nsc_ircc_init_39x },

	{ "IBM", { 0x2e, 0x4e, 0x0 }, 0x20, 0xf4, 0xff,

	/* IBM ThinkPads using PC8738x (T60/X60/Z60) */

	{ "IBM-PC8738x", { 0x2e, 0x4e, 0x0 }, 0x20, 0xf4, 0xff,

	  nsc_ircc_probe_39x, nsc_ircc_init_39x },

	/* IBM ThinkPads using PC8394T (T43/R52/?) */

	{ "IBM-PC8394T", { 0x2e, 0x4e, 0x0 }, 0x20, 0xf9, 0xff,

	  nsc_ircc_probe_39x, nsc_ircc_init_39x },

	  nsc_ircc_probe_39x, nsc_ircc_init_39x },

	{ NULL }

	{ NULL }

};

};