diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-07 02:53:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-07 02:53:30 -0400 |
| commit | 4a35ecf8bf1c4b039503fa554100fe85c761de76 (patch) | |
| tree | 9b75f5d5636004d9a9aa496924377379be09aa1f /fs/Makefile | |
| parent | b4d562e3c3553ac58c7120555c4e4aefbb090a2a (diff) | |
| parent | fb9e2d887243499b8d28efcf80821c4f6a092395 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bonding/bond_main.c
drivers/net/via-velocity.c
drivers/net/wireless/iwlwifi/iwl-agn.c
Diffstat (limited to 'fs/Makefile')
| -rw-r--r-- | fs/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/Makefile b/fs/Makefile index c3633aa46911..97f340f14ba2 100644 --- a/fs/Makefile +++ b/fs/Makefile | |||
| @@ -125,3 +125,4 @@ obj-$(CONFIG_OCFS2_FS) += ocfs2/ | |||
| 125 | obj-$(CONFIG_BTRFS_FS) += btrfs/ | 125 | obj-$(CONFIG_BTRFS_FS) += btrfs/ |
| 126 | obj-$(CONFIG_GFS2_FS) += gfs2/ | 126 | obj-$(CONFIG_GFS2_FS) += gfs2/ |
| 127 | obj-$(CONFIG_EXOFS_FS) += exofs/ | 127 | obj-$(CONFIG_EXOFS_FS) += exofs/ |
| 128 | obj-$(CONFIG_CEPH_FS) += ceph/ | ||