From 6a6d42cbfa243a5e0ffb5d1736a5690264d7eb5a Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Wed, 3 Feb 2010 09:32:06 +0000
Subject: [PATCH] --- yaml --- r: 183807 b: refs/heads/master c:
 a4b97f2054af2e411c414ed4cb5e1d0dbfd24a47 h: refs/heads/master i:   183805:
 abf7000cb6609f9a19f93be5dd4778ec357c8c4a   183803:
 f9ce1485b3c48eb729afa0218565a84e7265d35d   183799:
 2450984d14ff9d7775fc9430562c141dab983bcc   183791:
 e90ed444ff0706803044653d4d2cdd17351b8c95   183775:
 754a1f404d015e37f5a3c3c043f34d995842d1be   183743:
 c0d692adbd44f805a3cfe7afac559627b4a5853a   183679:
 1670cc70b6f34c5feadf294871f3d13446fcedfe   183551:
 6ab0706e1cf43703ac2ac97ddc1b092658e6250b   183295:
 762fad266a16f262b601c0c626f383b19a21fcee v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/sfc/net_driver.h | 1 -
 trunk/drivers/net/sfc/selftest.c   | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b46bdb9af826..403a2303f0e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 754c653a4e62bfa19b4e015c45198863c4211947
+refs/heads/master: a4b97f2054af2e411c414ed4cb5e1d0dbfd24a47
diff --git a/trunk/drivers/net/sfc/net_driver.h b/trunk/drivers/net/sfc/net_driver.h
index ac77a252c7e2..cb018e272097 100644
--- a/trunk/drivers/net/sfc/net_driver.h
+++ b/trunk/drivers/net/sfc/net_driver.h
@@ -18,7 +18,6 @@
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
 #include <linux/if_vlan.h>
-#include <linux/timer.h>
 #include <linux/mdio.h>
 #include <linux/list.h>
 #include <linux/pci.h>
diff --git a/trunk/drivers/net/sfc/selftest.c b/trunk/drivers/net/sfc/selftest.c
index 8a5a7b6d042d..cf0139a7d9a4 100644
--- a/trunk/drivers/net/sfc/selftest.c
+++ b/trunk/drivers/net/sfc/selftest.c
@@ -24,8 +24,6 @@
 #include "nic.h"
 #include "selftest.h"
 #include "workarounds.h"
-#include "spi.h"
-#include "io.h"
 
 /*
  * Loopback test packet structure