diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-20 22:39:47 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-20 22:39:47 (GMT) |
| commit | 55fa518867978e1f5fd8353098f80d125ac734d7 (patch) | |
| tree | 3502b331c1f9ec4cac25dc8ba30b6a0a324e350c /net/can/af_can.c | |
| parent | bb1f24bf00a85f666b56a09b7cdbfd221af16c2c (diff) | |
| parent | eea0579fc85e64e9f05361d5aacf496fe7a151aa (diff) | |
| download | linux-fsl-qoriq-55fa518867978e1f5fd8353098f80d125ac734d7.tar.xz | |
Merge branch 'topic/pcsp-fix' into topic/misc
Diffstat (limited to 'net/can/af_can.c')
| -rw-r--r-- | net/can/af_can.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/can/af_can.c b/net/can/af_can.c index 8035fbf..7d4d2b3 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c @@ -128,8 +128,8 @@ static int can_create(struct net *net, struct socket *sock, int protocol) if (net != &init_net) return -EAFNOSUPPORT; -#ifdef CONFIG_KMOD - /* try to load protocol module, when CONFIG_KMOD is defined */ +#ifdef CONFIG_MODULES + /* try to load protocol module kernel is modular */ if (!proto_tab[protocol]) { err = request_module("can-proto-%d", protocol); |