From 982de45cf87098ab26a8f1edd303658ae3238357 Mon Sep 17 00:00:00 2001
From: Santiago Leon <santil@linux.vnet.ibm.com>
Date: Fri, 3 Sep 2010 18:29:47 +0000
Subject: [PATCH] --- yaml --- r: 214321 b: refs/heads/master c:
 c22960977ad4b01dc608579e0865eac3b2bc9ce8 h: refs/heads/master i:   214319:
 2e5d5d2b070278e3e00f11e59e676827a9a12064 v: v3

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

diff --git a/[refs] b/[refs]
index 25388e638d41..d478fe363933 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6485911a5c04c328939113528805f15b90ae28cf
+refs/heads/master: c22960977ad4b01dc608579e0865eac3b2bc9ce8
diff --git a/trunk/drivers/net/ibmveth.c b/trunk/drivers/net/ibmveth.c
index 82cbf507f73e..dfa2ee7a92c8 100644
--- a/trunk/drivers/net/ibmveth.c
+++ b/trunk/drivers/net/ibmveth.c
@@ -29,14 +29,12 @@
 #include <linux/moduleparam.h>
 #include <linux/types.h>
 #include <linux/errno.h>
-#include <linux/ioport.h>
 #include <linux/dma-mapping.h>
 #include <linux/kernel.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/init.h>
-#include <linux/delay.h>
 #include <linux/mm.h>
 #include <linux/pm.h>
 #include <linux/ethtool.h>
@@ -48,7 +46,6 @@
 #include <asm/atomic.h>
 #include <asm/vio.h>
 #include <asm/iommu.h>
-#include <asm/uaccess.h>
 #include <asm/firmware.h>
 
 #include "ibmveth.h"