From b5535277786fc0e570767738892955236bea2e44 Mon Sep 17 00:00:00 2001 From: ISHIKAWA Mutsumi Date: Thu, 26 Mar 2009 21:58:20 +0900 Subject: [PATCH] --- yaml --- r: 141947 b: refs/heads/master c: d5b02695d5471b38064efeba2b102bd5ead55297 h: refs/heads/master i: 141945: 1dca356e353f69bd30ecca3a80f16e7c104e249c 141943: cd7ed948ee4b67ada6cc5735b51140e7c20bb29b v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/sony-laptop.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b786e44edae2..53d6869fccbd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b24ef093aec6d7b9c18af75644ec22b4069b283 +refs/heads/master: d5b02695d5471b38064efeba2b102bd5ead55297 diff --git a/trunk/drivers/platform/x86/sony-laptop.c b/trunk/drivers/platform/x86/sony-laptop.c index 813d0e03d9c5..5030f991906a 100644 --- a/trunk/drivers/platform/x86/sony-laptop.c +++ b/trunk/drivers/platform/x86/sony-laptop.c @@ -1824,6 +1824,13 @@ static void sony_pic_detect_device_type(struct sony_pic_dev *dev) goto out; } + pcidev = pci_get_device(PCI_VENDOR_ID_INTEL, + PCI_DEVICE_ID_INTEL_ICH9_1, NULL); + if (pcidev) { + dev->control = &spic_types[2]; + goto out; + } + /* default */ dev->control = &spic_types[1];