Message ID | m3ljt0pvmg.fsf@intrepid.localdomain |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Krzysztof Halasa <khc@pm.waw.pl> Date: Sat, 24 Jan 2009 16:32:55 +0100 > Jaswinder Singh Rajput <jaswinder@kernel.org> writes: > > > After killing CONFIG_DLCI and CONFIG_DLCI_MODULE, it is also killing the > > kernel: > > > > CC net/socket.o > > In file included from net/socket.c:75: > > include/linux/if_frad.h:170: error: ‘CONFIG_DLCI_MAX’ undeclared here (not in a function) > > Perhaps this would do (untested). > Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl> This looks good, applied, thanks everyone.
diff --git a/include/linux/if_frad.h b/include/linux/if_frad.h index 5c34240..60e16a5 100644 --- a/include/linux/if_frad.h +++ b/include/linux/if_frad.h @@ -26,8 +26,6 @@ #include <linux/if.h> -#if defined(CONFIG_DLCI) || defined(CONFIG_DLCI_MODULE) - /* Structures and constants associated with the DLCI device driver */ struct dlci_add @@ -127,6 +125,8 @@ struct frad_conf #ifdef __KERNEL__ +#if defined(CONFIG_DLCI) || defined(CONFIG_DLCI_MODULE) + /* these are the fields of an RFC 1490 header */ struct frhdr { @@ -190,12 +190,10 @@ struct frad_local int buffer; /* current buffer for S508 firmware */ }; -#endif /* __KERNEL__ */ - #endif /* CONFIG_DLCI || CONFIG_DLCI_MODULE */ -#ifdef __KERNEL__ extern void dlci_ioctl_set(int (*hook)(unsigned int, void __user *)); -#endif + +#endif /* __KERNEL__ */ #endif