diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-01-31 14:03:00 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-01-31 14:03:00 -0800 |
| commit | 0ffbf8bf21db0186e9fbb024a1796c3148790578 (patch) | |
| tree | 8004e1dc2c6893f2aa0b8a2279718a2120fef838 /net/socket.c | |
| parent | 51da8e2b4e0e4b14e5ec0fd32473dcfc2562b822 (diff) | |
Revert "appletalk: move to staging"
This reverts commit a6238f21736af3f47bdebf3895f477f5f23f1af9
Appletalk got some patches to fix up the BLK usage in it in the
network tree, so this removal isn't needed.
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: <acme@ghostprotocols.net>
Cc: netdev@vger.kernel.org,
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/socket.c b/net/socket.c index 26f7bcf36810..ac2219f90d5d 100644 --- a/net/socket.c +++ b/net/socket.c @@ -103,6 +103,7 @@ #include <linux/ipv6_route.h> #include <linux/route.h> #include <linux/sockios.h> +#include <linux/atalk.h> static int sock_no_open(struct inode *irrelevant, struct file *dontcare); static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov, |