Annotation of /trunk/kernel26-magellan/patches-2.6.16-r8/0101-2.6.16.12-ICH7.patch
Parent Directory | Revision Log
Revision 70 -
(hide annotations)
(download)
Thu May 11 19:09:22 2006 UTC (18 years, 4 months ago) by niro
File size: 1188 byte(s)
Thu May 11 19:09:22 2006 UTC (18 years, 4 months ago) by niro
File size: 1188 byte(s)
import
1 | niro | 70 | From: Arnaud MAZIN <arnaud.mazin@gmail.com> |
2 | Date: Thu, 20 Apr 2006 16:01:02 +0000 (+0000) | ||
3 | Subject: [PATCH] sonypi: correct detection of new ICH7-based laptops | ||
4 | X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/stable/linux-2.6.16.y.git;a=commitdiff;h=e3c7674c8c029d59b060ce1e41e40f3efec49a85 | ||
5 | |||
6 | [PATCH] sonypi: correct detection of new ICH7-based laptops | ||
7 | |||
8 | Add a test to detect the ICH7 based Core Duo SONY laptops (such as the SZ1) | ||
9 | as type3 models. | ||
10 | |||
11 | Signed-off-by: Arnaud MAZIN <arnaud.mazin@gmail.com> | ||
12 | Acked-by: Stelian Pop <stelian@poppies.net> | ||
13 | Signed-off-by: Andrew Morton <akpm@osdl.org> | ||
14 | Signed-off-by: Linus Torvalds <torvalds@osdl.org> | ||
15 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | ||
16 | --- | ||
17 | |||
18 | --- a/drivers/char/sonypi.c | ||
19 | +++ b/drivers/char/sonypi.c | ||
20 | @@ -1341,6 +1341,9 @@ static int __devinit sonypi_probe(struct | ||
21 | else if ((pcidev = pci_get_device(PCI_VENDOR_ID_INTEL, | ||
22 | PCI_DEVICE_ID_INTEL_ICH6_1, NULL))) | ||
23 | sonypi_device.model = SONYPI_DEVICE_MODEL_TYPE3; | ||
24 | + else if ((pcidev = pci_get_device(PCI_VENDOR_ID_INTEL, | ||
25 | + PCI_DEVICE_ID_INTEL_ICH7_1, NULL))) | ||
26 | + sonypi_device.model = SONYPI_DEVICE_MODEL_TYPE3; | ||
27 | else | ||
28 | sonypi_device.model = SONYPI_DEVICE_MODEL_TYPE2; | ||
29 |