merge
authorFlorian Pose <fp@igh-essen.com>
Tue, 23 Feb 2010 13:18:31 +0100
changeset 1821 40321a37d085
parent 1820 eec8a41bfb9f (current diff)
parent 1819 44f6ca6974fd (diff)
child 1822 74e6ac2369f4
merge
--- a/devices/e100-2.6.27-ethercat.c	Tue Feb 23 13:17:59 2010 +0100
+++ b/devices/e100-2.6.27-ethercat.c	Tue Feb 23 13:18:31 2010 +0100
@@ -2888,8 +2888,10 @@
 		device_set_wakeup_enable(&pdev->dev, true);
 	}
 
+#ifdef CONFIG_PCI // avoid compiler error on kernels not supporting PCI
 	/* ack any pending wake events, disable PME */
 	pci_pme_active(pdev, false);
+#endif
 
 	// offer device to EtherCAT master module
 	nic->ecdev = ecdev_offer(netdev, e100_ec_poll, THIS_MODULE);