diff --git a/[refs] b/[refs]
index b37f7e4a9c2f..00c75fde502c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3a87c3767b476a2115a8d9c7aa5496c153d1dc5
+refs/heads/master: cfe116c2c03d2c09b86edb5b5870bd169caec5cd
diff --git a/trunk/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/trunk/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
index 4a8d6426641e..0059cac10c36 100644
--- a/trunk/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/trunk/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
@@ -115,7 +115,7 @@ static inline u16 ft1000_read_fifo_len(struct net_device *dev)
 //     value  - value of dpram
 //
 //---------------------------------------------------------------------------
-u16 ft1000_read_dpram(struct net_device * dev, int offset)
+u16 ft1000_read_dpram(struct net_device *dev, int offset)
 {
 	struct ft1000_info *info = netdev_priv(dev);
 	unsigned long flags;