diff --git a/[refs] b/[refs] index 581fa059b437..80c888b46be6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec4c6675230402384976d34d38e2b828be6ad0d9 +refs/heads/master: aab048923955ca2fa050a06b5a54568b4e6c5f4c diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c index c1f4f13bf485..31929ef5332d 100644 --- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +++ b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c @@ -1751,8 +1751,8 @@ static int ft1000_proc_drvmsg(struct ft1000_device *dev, u16 size) return status; } -int ft1000_poll(void* dev_id) { - +int ft1000_poll(void* dev_id) +{ struct ft1000_device *dev = (struct ft1000_device *)dev_id; struct ft1000_info *info = netdev_priv(dev->net);