diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-05 02:15:07 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-05 02:15:07 +0200 |
| commit | 5941de8eadc287f3f47b87ce9888734ee07d210b (patch) | |
| tree | 2f5a8e84c33ae2df61e4e807798a153d6b7f6fbb /arch/s390/include/asm/resource.h | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6 (diff) | |
| parent | [S390] move include/asm-s390 to arch/s390/include/asm (diff) | |
| download | linux-5941de8eadc287f3f47b87ce9888734ee07d210b.tar.xz linux-5941de8eadc287f3f47b87ce9888734ee07d210b.zip | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] move include/asm-s390 to arch/s390/include/asm
Diffstat (limited to 'arch/s390/include/asm/resource.h')
| -rw-r--r-- | arch/s390/include/asm/resource.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/s390/include/asm/resource.h b/arch/s390/include/asm/resource.h new file mode 100644 index 000000000000..366c01de04f2 --- /dev/null +++ b/arch/s390/include/asm/resource.h @@ -0,0 +1,15 @@ +/* + * include/asm-s390/resource.h + * + * S390 version + * + * Derived from "include/asm-i386/resources.h" + */ + +#ifndef _S390_RESOURCE_H +#define _S390_RESOURCE_H + +#include <asm-generic/resource.h> + +#endif + |