SOURCES (LINUX_2_6): acpi-20050729-2.6.12.patch - pld uses sk98lin...

[pluto]

Author: pluto                        Date: Sun Jul 31 12:51:34 2005 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- pld uses sk98lin driver from marvel yukon's site
  (it supports suspend/resume).

---- Files affected:
SOURCES:
   acpi-20050729-2.6.12.patch (1.1.2.1 -> 1.1.2.2) 

---- Diffs:

================================================================
Index: SOURCES/acpi-20050729-2.6.12.patch
diff -u SOURCES/acpi-20050729-2.6.12.patch:1.1.2.1 SOURCES/acpi-20050729-2.6.12.patch:1.1.2.2
--- SOURCES/acpi-20050729-2.6.12.patch:1.1.2.1	Sun Jul 31 14:34:43 2005
+++ SOURCES/acpi-20050729-2.6.12.patch	Sun Jul 31 14:51:29 2005
@@ -147,7 +147,6 @@
  drivers/base/sys.c                                |    1 
  drivers/net/b44.c                                 |    3 
  drivers/net/ne2k-pci.c                            |    3 
- drivers/net/sk98lin/skge.c                        |   63 +
  drivers/pci/pci-acpi.c                            |  110 ++
  drivers/pci/pci.c                                 |   22 
  drivers/pci/pci.h                                 |    4 
@@ -215,7 +214,7 @@
  include/linux/pm.h                                |    2 
  kernel/power/main.c                               |   16 
  sound/pci/intel8x0.c                              |    6 
- 217 files changed, 12228 insertions(+), 8305 deletions(-)
+ 216 files changed, 12165 insertions(+), 8305 deletions(-)
 diff --git a/Documentation/acpi-hotkey.txt b/Documentation/acpi-hotkey.txt
 new file mode 100644
 --- /dev/null
@@ -31139,86 +31138,6 @@
  	NS8390_init(dev, 1);
  	netif_device_attach(dev);
  
-diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c
---- a/drivers/net/sk98lin/skge.c
-+++ b/drivers/net/sk98lin/skge.c
-@@ -5134,6 +5134,67 @@ static void __devexit skge_remove_one(st
- 	kfree(pAC);
- }
- 
-+#ifdef CONFIG_PM
-+static int skge_suspend(struct pci_dev *pdev, pm_message_t state)
-+{
-+	struct net_device *dev = pci_get_drvdata(pdev);
-+	DEV_NET *pNet = netdev_priv(dev);
-+	SK_AC *pAC = pNet->pAC;
-+	struct net_device *otherdev = pAC->dev[1];
-+
-+	if (pNet->Up) {
-+		pAC->WasIfUp[0] = SK_TRUE;
-+		DoPrintInterfaceChange = SK_FALSE;
-+		SkDrvDeInitAdapter(pAC, 0);  /* performs SkGeClose */
-+	}
-+	if (otherdev != dev) {
-+		pNet = netdev_priv(otherdev);
-+		if (pNet->Up) {
-+			pAC->WasIfUp[1] = SK_TRUE;
-+			DoPrintInterfaceChange = SK_FALSE;
-+			SkDrvDeInitAdapter(pAC, 1);  /* performs SkGeClose */
-+		}
-+	}
-+
-+	pci_save_state(pdev);
-+	pci_enable_wake(pdev, pci_choose_state(pdev, state), 0);
-+	if (pAC->AllocFlag & SK_ALLOC_IRQ) {
-+		free_irq(dev->irq, dev);
-+	}
-+	pci_disable_device(pdev);
-+	pci_set_power_state(pdev, pci_choose_state(pdev, state));
-+
-+	return 0;
-+}
-+
-+static int skge_resume(struct pci_dev *pdev)
-+{
-+	struct net_device *dev = pci_get_drvdata(pdev);
-+	DEV_NET *pNet = netdev_priv(dev);
-+	SK_AC *pAC = pNet->pAC;
-+
-+	pci_set_power_state(pdev, PCI_D0);
-+	pci_restore_state(pdev);
-+	pci_enable_device(pdev);
-+	pci_set_master(pdev);
-+	if (pAC->GIni.GIMacsFound == 2)
-+		request_irq(dev->irq, SkGeIsr, SA_SHIRQ, pAC->Name, dev);
-+	else
-+		request_irq(dev->irq, SkGeIsrOnePort, SA_SHIRQ, pAC->Name, dev);
-+
-+        if (pAC->WasIfUp[0] == SK_TRUE) {
-+		DoPrintInterfaceChange = SK_FALSE;
-+		SkDrvInitAdapter(pAC, 0);    /* first device  */
-+        }
-+	if (pAC->dev[1] != dev && pAC->WasIfUp[1] == SK_TRUE) {
-+		DoPrintInterfaceChange = SK_FALSE;
-+		SkDrvInitAdapter(pAC, 1);    /* first device  */
-+	}
-+
-+	return 0;
-+}
-+#endif
-+
- static struct pci_device_id skge_pci_tbl[] = {
- 	{ PCI_VENDOR_ID_3COM, 0x1700, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
- 	{ PCI_VENDOR_ID_3COM, 0x80eb, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-@@ -5159,6 +5220,8 @@ static struct pci_driver skge_driver = {
- 	.id_table	= skge_pci_tbl,
- 	.probe		= skge_probe_one,
- 	.remove		= __devexit_p(skge_remove_one),
-+	.suspend	= skge_suspend,
-+	.resume		= skge_resume,
- };
- 
- static int __init skge_init(void)
 diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
 --- a/drivers/pci/pci-acpi.c
 +++ b/drivers/pci/pci-acpi.c
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/acpi-20050729-2.6.12.patch?r1=1.1.2.1&r2=1.1.2.2&f=u