Merge branch 'linus' into sched/core, to resolve conflicts

[karo-tx-linux.git] / fs / ramfs / file-mmu.c

diff --git a/fs/ramfs/file-mmu.c b/fs/ramfs/file-mmu.c
index 4884ac5ae9bea224517e384588847a44f4f8e462..1e56a4e8cf7cd47d4886731ea063c95be9f078ee 100644 (file)
--- a/fs/ramfs/file-mmu.c
+++ b/fs/ramfs/file-mmu.c
@@ -30,13 +30,6 @@
 
 #include "internal.h"
 
-const struct address_space_operations ramfs_aops = {
-       .readpage       = simple_readpage,
-       .write_begin    = simple_write_begin,
-       .write_end      = simple_write_end,
-       .set_page_dirty = __set_page_dirty_no_writeback,
-};
-
 const struct file_operations ramfs_file_operations = {
        .read           = do_sync_read,
        .aio_read       = generic_file_aio_read,