patch-2.4.0-test6 linux/drivers/net/eepro100.c

• Lines: 43
• Date: Wed Aug 9 13:49:28 2000
• Orig file: v2.4.0-test5/linux/drivers/net/eepro100.c
• Orig date: Fri Jul 14 12:12:10 2000

diff -u --recursive --new-file v2.4.0-test5/linux/drivers/net/eepro100.c linux/drivers/net/eepro100.c
@@ -568,8 +568,11 @@
 static int eepro100_init_one(struct pci_dev *pdev,
 		const struct pci_device_id *ent);
 static void eepro100_remove_one (struct pci_dev *pdev);
+
+#ifdef CONFIG_EEPRO100_PM
 static void eepro100_suspend (struct pci_dev *pdev);
 static void eepro100_resume (struct pci_dev *pdev);
+#endif /* CONFIG_EEPRO100_PM */
 
 static int do_eeprom_cmd(long ioaddr, int cmd, int cmd_len);
 static int mdio_read(long ioaddr, int phy_id, int location);
@@ -2182,6 +2185,9 @@
 	sp->rx_mode = new_rx_mode;
 }
 
+
+#ifdef CONFIG_EEPRO100_PM
+
 static void eepro100_suspend(struct pci_dev *pdev)
 {
 	struct net_device *dev = pdev->driver_data;
@@ -2214,6 +2220,8 @@
 	set_rx_mode(dev);
 }
 
+#endif /* CONFIG_EEPRO100_PM */
+
 static void __devexit eepro100_remove_one (struct pci_dev *pdev)
 {
 	struct net_device *dev = pdev->driver_data;
@@ -2252,8 +2260,11 @@
 	id_table:	eepro100_pci_tbl,
 	probe:		eepro100_init_one,
 	remove:		eepro100_remove_one,
+
+#ifdef CONFIG_EEPRO100_PM
 	suspend:	eepro100_suspend,
 	resume:		eepro100_resume,
+#endif
 };
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,48)