diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /net/unix/af_unix.c | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index acc73fe68698..c478fc8db776 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c | |||
| @@ -85,7 +85,6 @@ | |||
| 85 | #include <linux/module.h> | 85 | #include <linux/module.h> |
| 86 | #include <linux/config.h> | 86 | #include <linux/config.h> |
| 87 | #include <linux/kernel.h> | 87 | #include <linux/kernel.h> |
| 88 | #include <linux/major.h> | ||
| 89 | #include <linux/signal.h> | 88 | #include <linux/signal.h> |
| 90 | #include <linux/sched.h> | 89 | #include <linux/sched.h> |
| 91 | #include <linux/errno.h> | 90 | #include <linux/errno.h> |