summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorArnaud MAZIN <arnaud.mazin@gmail.com>2006-04-20 02:43:20 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-20 07:54:04 -0700
commitbf104e641c5a6567cc00d4ae9d8510cef9f63b18 (patch)
tree3ba25ecdd877c304a5567661d08ff12031d2d8e1 /drivers/char
parent962f831f67301265dcd2cd96408d07d95d556aed (diff)
downloadop-kernel-dev-bf104e641c5a6567cc00d4ae9d8510cef9f63b18.zip
op-kernel-dev-bf104e641c5a6567cc00d4ae9d8510cef9f63b18.tar.gz
[PATCH] sonypi: correct detection of new ICH7-based laptops
Add a test to detect the ICH7 based Core Duo SONY laptops (such as the SZ1) as type3 models. Signed-off-by: Arnaud MAZIN < arnaud.mazin@gmail.com> Acked-by: Stelian Pop <stelian@poppies.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/sonypi.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index f8dd852..a90f5d9 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -1341,6 +1341,9 @@ static int __devinit sonypi_probe(struct platform_device *dev)
else if ((pcidev = pci_get_device(PCI_VENDOR_ID_INTEL,
PCI_DEVICE_ID_INTEL_ICH6_1, NULL)))
sonypi_device.model = SONYPI_DEVICE_MODEL_TYPE3;
+ else if ((pcidev = pci_get_device(PCI_VENDOR_ID_INTEL,
+ PCI_DEVICE_ID_INTEL_ICH7_1, NULL)))
+ sonypi_device.model = SONYPI_DEVICE_MODEL_TYPE3;
else
sonypi_device.model = SONYPI_DEVICE_MODEL_TYPE2;
OpenPOWER on IntegriCloud