diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-06-10 18:07:47 -0400 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-06-10 18:07:47 -0400 |
| commit | 4e73e0eb633f8a1b5cbf20e7f42c6dbfec1d1ca7 (patch) | |
| tree | 0cea46e43f0625244c3d06a71d6559e5ec5419ca /fs/afs/cache.h | |
| parent | 4156e735d3abde8e9243b5d22f7999dd3fffab2e (diff) | |
| parent | 07a2039b8eb0af4ff464efd3dfd95de5c02648c6 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/afs/cache.h')
| -rw-r--r-- | fs/afs/cache.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/fs/afs/cache.h b/fs/afs/cache.h index 36a3642cf90e..5c4f6b499e90 100644 --- a/fs/afs/cache.h +++ b/fs/afs/cache.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* AFS local cache management interface | 1 | /* AFS local cache management interface |
| 2 | * | 2 | * |
| 3 | * Copyright (C) 2002 Red Hat, Inc. All Rights Reserved. | 3 | * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved. |
| 4 | * Written by David Howells (dhowells@redhat.com) | 4 | * Written by David Howells (dhowells@redhat.com) |
| 5 | * | 5 | * |
| 6 | * This program is free software; you can redistribute it and/or | 6 | * This program is free software; you can redistribute it and/or |
| @@ -9,15 +9,4 @@ | |||
| 9 | * 2 of the License, or (at your option) any later version. | 9 | * 2 of the License, or (at your option) any later version. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #ifndef AFS_CACHE_H | 12 | #include <linux/fscache.h> |
| 13 | #define AFS_CACHE_H | ||
| 14 | |||
| 15 | #undef AFS_CACHING_SUPPORT | ||
| 16 | |||
| 17 | #include <linux/mm.h> | ||
| 18 | #ifdef AFS_CACHING_SUPPORT | ||
| 19 | #include <linux/cachefs.h> | ||
| 20 | #endif | ||
| 21 | #include "types.h" | ||
| 22 | |||
| 23 | #endif /* AFS_CACHE_H */ | ||