diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-13 17:41:05 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-13 17:41:05 -0400 |
| commit | 83400207a07584539366f6859362db6872809a12 (patch) | |
| tree | fad187f8b3bebf1b387ec42ef8143e6f4e49a256 /include/asm-frv/resource.h | |
| parent | 0d489ffb76de0fe804cf06a9d4d11fa7342d74b9 (diff) | |
| parent | 80a04d3f2f94fb68b5df05e3ac6697130bc3467a (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
MAINTAINERS
Diffstat (limited to 'include/asm-frv/resource.h')
| -rw-r--r-- | include/asm-frv/resource.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/asm-frv/resource.h b/include/asm-frv/resource.h deleted file mode 100644 index 5fc60548fd02..000000000000 --- a/include/asm-frv/resource.h +++ /dev/null | |||
| @@ -1,7 +0,0 @@ | |||
| 1 | #ifndef _ASM_RESOURCE_H | ||
| 2 | #define _ASM_RESOURCE_H | ||
| 3 | |||
| 4 | #include <asm-generic/resource.h> | ||
| 5 | |||
| 6 | #endif /* _ASM_RESOURCE_H */ | ||
| 7 | |||