]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Apr 2009 16:53:22 +0000 (09:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Apr 2009 16:53:22 +0000 (09:53 -0700)
* 'for-linus' of git://git.open-osd.org/linux-open-osd:
  fs: Add exofs to Kernel build
  exofs: Documentation
  exofs: export_operations
  exofs: super_operations and file_system_type
  exofs: dir_inode and directory operations
  exofs: address_space_operations
  exofs: symlink_inode and fast_symlink_inode operations
  exofs: file and file_inode operations
  exofs: Kbuild, Headers and osd utils

1  2 
fs/Makefile

diff --combined fs/Makefile
index b5cd8e18dd9feb14317339cf5220d39102d48f0a,ba77ef2d293fe973a4ff6d3c9fbfb824250522e5..15f73014a208ce6f47dbc9c3ff3f2990cd2bcd5a
@@@ -11,7 -11,7 +11,7 @@@ obj-y :=      open.o read_write.o file_table
                attr.o bad_inode.o file.o filesystems.o namespace.o \
                seq_file.o xattr.o libfs.o fs-writeback.o \
                pnode.o drop_caches.o splice.o sync.o utimes.o \
 -              stack.o
 +              stack.o fs_struct.o
  
  ifeq ($(CONFIG_BLOCK),y)
  obj-y +=      buffer.o bio.o block_dev.o direct-io.o mpage.o ioprio.o
@@@ -120,3 -120,4 +120,4 @@@ obj-$(CONFIG_DEBUG_FS)             += debugfs
  obj-$(CONFIG_OCFS2_FS)                += ocfs2/
  obj-$(CONFIG_BTRFS_FS)                += btrfs/
  obj-$(CONFIG_GFS2_FS)           += gfs2/
+ obj-$(CONFIG_EXOFS_FS)          += exofs/