dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

isdn: Make CONFIG_ISDN depend on CONFIG_NETDEVICES 

It doesn't make much sense to enable ISDN services if you don't
intend to connect to a network. Therefore insisting that ISDN
depends on NETDEVICES seems logical. We can then remove any
guards mentioning NETDEVICES inside all subordinate drivers.

This also has the nice side-effect of fixing the warning below
when ISDN_I4L && !CONFIG_NETDEVICES at compile time.

This patch fixes:
drivers/isdn/i4l/isdn_common.c: In function ‘isdn_ioctl’:
drivers/isdn/i4l/isdn_common.c:1278:8: warning: unused variable ‘s’ [-Wunused-variable]

Cc: Karsten Keil <isdn@linux-pingi.de>
Cc: netdev@vger.kernel.org
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Lee Jones 2012-11-06 23:55:03 +00:00 committed by David S. Miller
parent 0062b15c10
commit 7fd78edc47
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/isdn/Kconfig
View File

@ -4,7 +4,7 @@
menuconfig ISDN menuconfig ISDN
bool "ISDN support" bool "ISDN support"
depends on NET depends on NET && NETDEVICES
depends on !S390 && !UML depends on !S390 && !UML
---help--- ---help---
ISDN ("Integrated Services Digital Network", called RNIS in France) ISDN ("Integrated Services Digital Network", called RNIS in France)

2
drivers/isdn/i4l/Kconfig
View File

@ -6,7 +6,7 @@ if ISDN_I4L
config ISDN_PPP config ISDN_PPP
bool "Support synchronous PPP" bool "Support synchronous PPP"
depends on INET && NETDEVICES depends on INET
select SLHC select SLHC
help help
Over digital connections such as ISDN, there is no need to Over digital connections such as ISDN, there is no need to

4
drivers/isdn/i4l/isdn_common.c
View File

@ -1312,7 +1312,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
} else } else
return -EINVAL; return -EINVAL;
break; break;
#ifdef CONFIG_NETDEVICES
case IIOCNETGPN: case IIOCNETGPN:
/* Get peer phone number of a connected /* Get peer phone number of a connected
* isdn network interface */ * isdn network interface */
@ -1322,7 +1321,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
return isdn_net_getpeer(&phone, argp); return isdn_net_getpeer(&phone, argp);
} else } else
return -EINVAL; return -EINVAL;
#endif
default: default:
return -EINVAL; return -EINVAL;
} }
@ -1352,7 +1350,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
case IIOCNETLCR: case IIOCNETLCR:
printk(KERN_INFO "INFO: ISDN_ABC_LCR_SUPPORT not enabled\n"); printk(KERN_INFO "INFO: ISDN_ABC_LCR_SUPPORT not enabled\n");
return -ENODEV; return -ENODEV;
#ifdef CONFIG_NETDEVICES
case IIOCNETAIF: case IIOCNETAIF:
/* Add a network-interface */ /* Add a network-interface */
if (arg) { if (arg) {
@ -1491,7 +1488,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
return -EFAULT; return -EFAULT;
return isdn_net_force_hangup(name); return isdn_net_force_hangup(name);
break; break;
#endif /* CONFIG_NETDEVICES */
case IIOCSETVER: case IIOCSETVER:
dev->net_verbose = arg; dev->net_verbose = arg;
printk(KERN_INFO "isdn: Verbose-Level is %d\n", dev->net_verbose); printk(KERN_INFO "isdn: Verbose-Level is %d\n", dev->net_verbose);