2 more .27 patches

diff --git a/queue-2.6.27/r8169-select-mii-in-kconfig.patch b/queue-2.6.27/r8169-select-mii-in-kconfig.patch
new file mode 100644 (file)
index 0000000..013e0f7
--- /dev/null
+++ b/queue-2.6.27/r8169-select-mii-in-kconfig.patch
@@ -0,0 +1,32 @@
+From b73724921d906d1642f9f6d054079c6b095903fe Mon Sep 17 00:00:00 2001
+From: Francois Romieu <romieu@fr.zoreil.com>
+Date: Sat, 13 Sep 2008 15:04:38 +0200
+Subject: r8169: select MII in Kconfig
+
+From: Francois Romieu <romieu@fr.zoreil.com>
+
+commit b73724921d906d1642f9f6d054079c6b095903fe upstream.
+
+drivers/built-in.o: In function `rtl8169_gset_xmii':
+r8169.c:(.text+0x82259): undefined reference to `mii_ethtool_gset'
+
+Signed-off-by: Hugh Dickins <hugh@veritas.com>
+Acked-by: Francois Romieu <romieu@fr.zoreil.com>
+Cc: Edward Hsu <edward_hsu@realtek.com.tw>
+Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/net/Kconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
+@@ -2046,6 +2046,7 @@ config R8169
+       tristate "Realtek 8169 gigabit ethernet support"
+       depends on PCI
+       select CRC32
++      select MII
+       ---help---
+         Say Y here if you have a Realtek 8169 PCI Gigabit Ethernet adapter.
+ 

diff --git a/queue-2.6.27/series b/queue-2.6.27/series
index 0d85e09c6e8850860ed40b770651feb31aaeec97..0cfaf06f2f1b95d7897c192e75f9eccf87b31482 100644 (file)
--- a/queue-2.6.27/series
+++ b/queue-2.6.27/series
@@ -18,3 +18,5 @@ block-fix-nr_phys_segments-miscalculation-bug.patch
 powerpc-mpic-fix-regression-caused-by-change-of-default-irq-affinity.patch
 input-alps-add-signature-for-dualpoint-found-in-dell-latitude-e6500.patch
 memory-hotplug-fix-page_zone-calculation-in-test_pages_isolated.patch
+r8169-select-mii-in-kconfig.patch
+sony-laptop-ignore-missing-_dis-method-on-pic-device.patch

diff --git a/queue-2.6.27/sony-laptop-ignore-missing-_dis-method-on-pic-device.patch b/queue-2.6.27/sony-laptop-ignore-missing-_dis-method-on-pic-device.patch
new file mode 100644 (file)
index 0000000..b193f83
--- /dev/null
+++ b/queue-2.6.27/sony-laptop-ignore-missing-_dis-method-on-pic-device.patch
@@ -0,0 +1,40 @@
+From 6158d3a2323835546c7cf83a170316fa77b726e0 Mon Sep 17 00:00:00 2001
+From: Matthew Garrett <mjg59@srcf.ucam.org>
+Date: Wed, 29 Oct 2008 14:01:03 -0700
+Subject: sony-laptop: ignore missing _DIS method on pic device
+
+From: Matthew Garrett <mjg59@srcf.ucam.org>
+
+commit 6158d3a2323835546c7cf83a170316fa77b726e0 upstream.
+
+At least the Vaio VGN-Z540N doesn't have this method, so let's not fail
+to suspend just because it doesn't exist.
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+Acked-by: Mattia Dongili <malattia@linux.it>
+Cc: Len Brown <lenb@kernel.org>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Steve Conklin <sconklin@canonical.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
+---
+ drivers/misc/sony-laptop.c |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/drivers/misc/sony-laptop.c
++++ b/drivers/misc/sony-laptop.c
+@@ -2315,8 +2315,10 @@ end:
+  */
+ static int sony_pic_disable(struct acpi_device *device)
+ {
+-      if (ACPI_FAILURE(acpi_evaluate_object(device->handle,
+-                      "_DIS", NULL, NULL)))
++      acpi_status ret = acpi_evaluate_object(device->handle, "_DIS", NULL,
++                                             NULL);
++
++      if (ACPI_FAILURE(ret) && ret != AE_NOT_FOUND)
+               return -ENXIO;
+ 
+       dprintk("Device disabled\n");