[kernel] r11900 - in dists/trunk/linux-2.6/debian/patches: bugfix/all series

[Martin Michlmayr]

Author: tbm
Date: Thu Jul 24 01:02:02 2008
New Revision: 11900

Log:
atl1d: fix !CONFIG_PM build


Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/all/atl1e_config_pm.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Added: dists/trunk/linux-2.6/debian/patches/bugfix/all/atl1e_config_pm.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/atl1e_config_pm.patch	Thu Jul 24 01:02:02 2008
@@ -0,0 +1,30 @@
+From: Jeff Garzik <jeff at garzik.org>
+Date: Wed, 23 Jul 2008 01:17:38 +0000 (-0400)
+Subject: [netdrvr] atl1d: fix !CONFIG_PM build
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=d6f8aa8586dabe605454f3c98a5c1a577c3e0cfb
+
+[netdrvr] atl1d: fix !CONFIG_PM build
+
+Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
+---
+
+diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c
+index 367c727..35264c2 100644
+--- a/drivers/net/atl1e/atl1e_main.c
++++ b/drivers/net/atl1e/atl1e_main.c
+@@ -2073,7 +2073,6 @@ static int atl1e_close(struct net_device *netdev)
+ 	return 0;
+ }
+ 
+-#ifdef CONFIG_PM
+ static int atl1e_suspend(struct pci_dev *pdev, pm_message_t state)
+ {
+ 	struct net_device *netdev = pci_get_drvdata(pdev);
+@@ -2207,6 +2206,7 @@ suspend_exit:
+ 	return 0;
+ }
+ 
++#ifdef CONFIG_PM
+ static int atl1e_resume(struct pci_dev *pdev)
+ {
+ 	struct net_device *netdev = pci_get_drvdata(pdev);

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Thu Jul 24 01:02:02 2008
@@ -57,6 +57,7 @@
 + bugfix/all/x86-acpi-sleep-x61s.patch
 + bugfix/powerpc/mm-mol.patch
 + features/all/drivers-net-atl1e.patch
++ bugfix/all/atl1e_config_pm.patch
 + bugfix/all/sound_hda_ich9.patch
 + bugfix/all/sound_hda_intel_dg33.patch
 + features/all/drivers-hp_ilo.patch