--- linux-2.6.18.i386/drivers/net/e1000/e1000_main.c.orig	2008-03-27 15:17:46.101620000 -0700
+++ linux-2.6.18.i386/drivers/net/e1000/e1000_main.c	2008-03-27 16:12:15.593918000 -0700
@@ -36,7 +36,7 @@ static char e1000_driver_string[] = "Int
 #else
 #define DRIVERNAPI "-NAPI"
 #endif
-#define DRV_VERSION "7.3.20-k2"DRIVERNAPI
+#define DRV_VERSION "7.3.20-k2ora"DRIVERNAPI
 const char e1000_driver_version[] = DRV_VERSION;
 static const char e1000_copyright[] = "Copyright (c) 1999-2006 Intel Corporation.";
 
@@ -226,6 +226,10 @@ static int debug = NETIF_MSG_DRV | NETIF
 module_param(debug, int, 0);
 MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
 
+static int entropy = 0;
+module_param(entropy, int, 0);
+MODULE_PARM_DESC(entropy, "Allow e1000 to populate the /dev/random entropy pool");
+
 /**
  * e1000_init_module - Driver Registration Routine
  *
@@ -274,8 +278,12 @@ static int e1000_request_irq(struct e100
 {
 	struct net_device *netdev = adapter->netdev;
 	void (*handler) = &e1000_intr;
-	int irq_flags = IRQF_SHARED;
-	int err;
+        int irq_flags, err;
+
+	if (entropy)
+	        irq_flags = IRQF_SHARED|SA_SAMPLE_RANDOM;
+	else 
+	        irq_flags = IRQF_SHARED;
 
 	if (adapter->hw.mac_type >= e1000_82571) {
 		adapter->have_msi = !pci_enable_msi(adapter->pdev);