Merge git://git.infradead.org/mtd-2.6

[mirror_ubuntu-artful-kernel.git] / fs / afs / cache.h

diff --git a/fs/afs/cache.h b/fs/afs/cache.h
index 9eb7722b34d5827be74c8e496d46c9af631920c8..5c4f6b499e90104a5c3184989090cf948a0b57fd 100644 (file)
--- a/fs/afs/cache.h
+++ b/fs/afs/cache.h
@@ -1,6 +1,6 @@
-/* cache.h: AFS local cache management interface
+/* AFS local cache management interface
  *
- * Copyright (C) 2002 Red Hat, Inc. All Rights Reserved.
+ * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
  * Written by David Howells (dhowells@redhat.com)
  *
  * This program is free software; you can redistribute it and/or
@@ -9,19 +9,4 @@
  * 2 of the License, or (at your option) any later version.
  */
 
-#ifndef _LINUX_AFS_CACHE_H
-#define _LINUX_AFS_CACHE_H
-
-#undef AFS_CACHING_SUPPORT
-
-#include <linux/mm.h>
-#ifdef AFS_CACHING_SUPPORT
-#include <linux/cachefs.h>
-#endif
-#include "types.h"
-
-#ifdef __KERNEL__
-
-#endif /* __KERNEL__ */
-
-#endif /* _LINUX_AFS_CACHE_H */
+#include <linux/fscache.h>