From 63a52f1d03744817150d9a000afa9451640b7064 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Mon, 10 Jan 2011 23:23:10 +0100
Subject: [PATCH] --- yaml --- r: 235675 b: refs/heads/master c:
 7bd74cd0e5f56088c0aa873bb6ba0dab0b21a7e1 h: refs/heads/master i:   235673:
 dbe8f323d0824e6ee4b3425a768ab720ede38051   235671:
 aab8766895733f84dc369891c8f8871a027496e0 v: v3

---
 [refs]                                                   | 2 +-
 trunk/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6b331addc5a9..41178c9a7b09 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34381c22b0a26ef6663f5fd92574d3f45243cabf
+refs/heads/master: 7bd74cd0e5f56088c0aa873bb6ba0dab0b21a7e1
diff --git a/trunk/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c b/trunk/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
index c56f588a790b..b0729fc3c89a 100644
--- a/trunk/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
+++ b/trunk/drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
@@ -30,7 +30,6 @@
 #include <linux/netdevice.h>
 #include <linux/timer.h>
 #include <linux/delay.h>
-#include <linux/slab.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <linux/vmalloc.h>