diff options
author | David S. Miller <davem@davemloft.net> | 2012-08-22 14:21:38 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-08-22 14:21:38 -0700 |
commit | 1304a7343b30fc4f16045412efdbb4179a3d9255 (patch) | |
tree | 83d667ac4f62e30f70305ce4cc7e030e3465f92e /arch/alpha/include/asm/socket.h | |
parent | team: add support for non-ethernet devices (diff) | |
parent | Merge branch 'akpm' (Andrew's patch-bomb) (diff) | |
download | linux-dev-1304a7343b30fc4f16045412efdbb4179a3d9255.tar.xz linux-dev-1304a7343b30fc4f16045412efdbb4179a3d9255.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/alpha/include/asm/socket.h')
-rw-r--r-- | arch/alpha/include/asm/socket.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/alpha/include/asm/socket.h b/arch/alpha/include/asm/socket.h index dcb221a4b5be..7d2f75be932e 100644 --- a/arch/alpha/include/asm/socket.h +++ b/arch/alpha/include/asm/socket.h @@ -76,9 +76,11 @@ /* Instruct lower device to use last 4-bytes of skb data as FCS */ #define SO_NOFCS 43 +#ifdef __KERNEL__ /* O_NONBLOCK clashes with the bits used for socket types. Therefore we * have to define SOCK_NONBLOCK to a different value here. */ #define SOCK_NONBLOCK 0x40000000 +#endif /* __KERNEL__ */ #endif /* _ASM_SOCKET_H */ |