# HG changeset patch
# User Florian Pose <fp@igh-essen.com>
# Date 1266927511 -3600
# Node ID 40321a37d0859b38cb0a68f8a7bab1cfef588d7d
# Parent  eec8a41bfb9f8f6b4d85b166e5397129c6f67df6# Parent  44f6ca6974fd68c06aacb2f1b9278f30d0a6a89a
merge

diff -r eec8a41bfb9f -r 40321a37d085 devices/e100-2.6.27-ethercat.c
--- 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);