diff options
| -rw-r--r-- | drivers/isdn/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/isdn/i4l/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/isdn/i4l/isdn_common.c | 4 |
3 files changed, 2 insertions, 6 deletions
diff --git a/drivers/isdn/Kconfig b/drivers/isdn/Kconfig index a233ed53913a..86cd75a0e84d 100644 --- a/drivers/isdn/Kconfig +++ b/drivers/isdn/Kconfig | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | menuconfig ISDN | 5 | menuconfig ISDN |
| 6 | bool "ISDN support" | 6 | bool "ISDN support" |
| 7 | depends on NET | 7 | depends on NET && NETDEVICES |
| 8 | depends on !S390 && !UML | 8 | depends on !S390 && !UML |
| 9 | ---help--- | 9 | ---help--- |
| 10 | ISDN ("Integrated Services Digital Network", called RNIS in France) | 10 | ISDN ("Integrated Services Digital Network", called RNIS in France) |
diff --git a/drivers/isdn/i4l/Kconfig b/drivers/isdn/i4l/Kconfig index 2302fbe70ac6..9c6650ea848e 100644 --- a/drivers/isdn/i4l/Kconfig +++ b/drivers/isdn/i4l/Kconfig | |||
| @@ -6,7 +6,7 @@ if ISDN_I4L | |||
| 6 | 6 | ||
| 7 | config ISDN_PPP | 7 | config ISDN_PPP |
| 8 | bool "Support synchronous PPP" | 8 | bool "Support synchronous PPP" |
| 9 | depends on INET && NETDEVICES | 9 | depends on INET |
| 10 | select SLHC | 10 | select SLHC |
| 11 | help | 11 | help |
| 12 | Over digital connections such as ISDN, there is no need to | 12 | Over digital connections such as ISDN, there is no need to |
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c index 8c610fa6782b..e2a945ee9f05 100644 --- a/drivers/isdn/i4l/isdn_common.c +++ b/drivers/isdn/i4l/isdn_common.c | |||
| @@ -1312,7 +1312,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg) | |||
| 1312 | } else | 1312 | } else |
| 1313 | return -EINVAL; | 1313 | return -EINVAL; |
| 1314 | break; | 1314 | break; |
| 1315 | #ifdef CONFIG_NETDEVICES | ||
| 1316 | case IIOCNETGPN: | 1315 | case IIOCNETGPN: |
| 1317 | /* Get peer phone number of a connected | 1316 | /* Get peer phone number of a connected |
| 1318 | * isdn network interface */ | 1317 | * isdn network interface */ |
| @@ -1322,7 +1321,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg) | |||
| 1322 | return isdn_net_getpeer(&phone, argp); | 1321 | return isdn_net_getpeer(&phone, argp); |
| 1323 | } else | 1322 | } else |
| 1324 | return -EINVAL; | 1323 | return -EINVAL; |
| 1325 | #endif | ||
| 1326 | default: | 1324 | default: |
| 1327 | return -EINVAL; | 1325 | return -EINVAL; |
| 1328 | } | 1326 | } |
| @@ -1352,7 +1350,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg) | |||
| 1352 | case IIOCNETLCR: | 1350 | case IIOCNETLCR: |
| 1353 | printk(KERN_INFO "INFO: ISDN_ABC_LCR_SUPPORT not enabled\n"); | 1351 | printk(KERN_INFO "INFO: ISDN_ABC_LCR_SUPPORT not enabled\n"); |
| 1354 | return -ENODEV; | 1352 | return -ENODEV; |
| 1355 | #ifdef CONFIG_NETDEVICES | ||
| 1356 | case IIOCNETAIF: | 1353 | case IIOCNETAIF: |
| 1357 | /* Add a network-interface */ | 1354 | /* Add a network-interface */ |
| 1358 | if (arg) { | 1355 | if (arg) { |
| @@ -1491,7 +1488,6 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg) | |||
| 1491 | return -EFAULT; | 1488 | return -EFAULT; |
| 1492 | return isdn_net_force_hangup(name); | 1489 | return isdn_net_force_hangup(name); |
| 1493 | break; | 1490 | break; |
| 1494 | #endif /* CONFIG_NETDEVICES */ | ||
| 1495 | case IIOCSETVER: | 1491 | case IIOCSETVER: |
| 1496 | dev->net_verbose = arg; | 1492 | dev->net_verbose = arg; |
| 1497 | printk(KERN_INFO "isdn: Verbose-Level is %d\n", dev->net_verbose); | 1493 | printk(KERN_INFO "isdn: Verbose-Level is %d\n", dev->net_verbose); |
