diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-15 19:44:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-15 19:44:53 -0400 |
| commit | d2a9a8ded48bec153f08ee87a40626c8d0737f79 (patch) | |
| tree | e4a90a4f2f65632506e3e04613891cb602843523 /net/Makefile | |
| parent | 2d896c780db9cda5dc102bf7a0a2cd4394c1342e (diff) | |
| parent | 0af8887ebf4556a76680a61b0bb156d934702c63 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
9p: fix a race condition bug in umount which caused a segfault
9p: re-enable mount time debug option
9p: cache meta-data when cache=loose
net/9p: set error to EREMOTEIO if trans->write returns zero
net/9p: change net/9p module name to 9pnet
9p: Reorganization of 9p file system code
Diffstat (limited to 'net/Makefile')
| -rw-r--r-- | net/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/Makefile b/net/Makefile index a87a88963432..bbe7d2a41486 100644 --- a/net/Makefile +++ b/net/Makefile | |||
| @@ -51,6 +51,7 @@ obj-$(CONFIG_TIPC) += tipc/ | |||
| 51 | obj-$(CONFIG_NETLABEL) += netlabel/ | 51 | obj-$(CONFIG_NETLABEL) += netlabel/ |
| 52 | obj-$(CONFIG_IUCV) += iucv/ | 52 | obj-$(CONFIG_IUCV) += iucv/ |
| 53 | obj-$(CONFIG_RFKILL) += rfkill/ | 53 | obj-$(CONFIG_RFKILL) += rfkill/ |
| 54 | obj-$(CONFIG_NET_9P) += 9p/ | ||
| 54 | 55 | ||
| 55 | ifeq ($(CONFIG_NET),y) | 56 | ifeq ($(CONFIG_NET),y) |
| 56 | obj-$(CONFIG_SYSCTL) += sysctl_net.o | 57 | obj-$(CONFIG_SYSCTL) += sysctl_net.o |