diff --git a/[refs] b/[refs] index 92bf508d51ee..fcf948ec19ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96ff77f7350576d1b25908b59f15d2ab5222c432 +refs/heads/master: e2398c61272f378b257b3107fdb960e0b642eeb6 diff --git a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c index bd28a6bfa86a..da706f84df64 100644 --- a/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c +++ b/trunk/drivers/staging/ft1000/ft1000-usb/ft1000_proc.c @@ -27,11 +27,7 @@ len += snprintf(page+len, PAGE_SIZE - len, "%d\n", var[i]) -//#ifdef INIT_NET_NS #define FTNET_PROC init_net.proc_net -//#else -//#define FTNET_PROC proc_net -//#endif u16 ft1000_read_dpram16 (struct ft1000_device *ft1000dev, u16 indx,