diff options
| author | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-01-16 22:21:04 +0100 |
|---|---|---|
| committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-01-16 22:21:04 +0100 |
| commit | f652f6c5b7cfdf139f4155d78f397e99ae1c4acc (patch) | |
| tree | 71c6344688bf56ea6aaf18c586ab69ff4f077ade /net/dcb/Makefile | |
| parent | [SCSI] sd,sr: kill compat SDEV_MEDIA_CHANGE event (diff) | |
| parent | [SCSI] target: Add LIO target core v4.0.0-rc6 (diff) | |
| download | linux-f652f6c5b7cfdf139f4155d78f397e99ae1c4acc.tar.xz linux-f652f6c5b7cfdf139f4155d78f397e99ae1c4acc.zip | |
Merge branch 'master' of /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 into for-linus
Diffstat (limited to 'net/dcb/Makefile')
| -rw-r--r-- | net/dcb/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dcb/Makefile b/net/dcb/Makefile index 9930f4cde818..c1282c9e64fa 100644 --- a/net/dcb/Makefile +++ b/net/dcb/Makefile @@ -1 +1 @@ -obj-$(CONFIG_DCB) += dcbnl.o +obj-$(CONFIG_DCB) += dcbnl.o dcbevent.o |