diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /net/netlink/Makefile | |
| parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'net/netlink/Makefile')
| -rw-r--r-- | net/netlink/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netlink/Makefile b/net/netlink/Makefile index 39d9c2dcd03c..e3589c2de49e 100644 --- a/net/netlink/Makefile +++ b/net/netlink/Makefile | |||
| @@ -2,4 +2,4 @@ | |||
| 2 | # Makefile for the netlink driver. | 2 | # Makefile for the netlink driver. |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | obj-y := af_netlink.o | 5 | obj-y := af_netlink.o attr.o genetlink.o |