diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-21 03:49:14 +0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-12-21 03:49:14 +0400 |
| commit | 21e89c0c48bb799beb09181740796fc80c9676e2 (patch) | |
| tree | bd5aef34a980f189ad41c75e881d225bc854bf44 /arch/cris/include/asm/resource.h | |
| parent | b911a6bdeef5848c468597d040e3407e0aee04ce (diff) | |
| parent | 91c7fbbf63f33c77d8d28de624834a21888842bb (diff) | |
| download | linux-21e89c0c48bb799beb09181740796fc80c9676e2.tar.xz | |
Merge branch 'fscache' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into for-linus
Diffstat (limited to 'arch/cris/include/asm/resource.h')
| -rw-r--r-- | arch/cris/include/asm/resource.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/cris/include/asm/resource.h b/arch/cris/include/asm/resource.h deleted file mode 100644 index b5d29448de4e..000000000000 --- a/arch/cris/include/asm/resource.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _CRIS_RESOURCE_H -#define _CRIS_RESOURCE_H - -#include <asm-generic/resource.h> - -#endif |