diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-24 16:22:33 -0400 |
| commit | baea7b946f00a291b166ccae7fcfed6c01530cc6 (patch) | |
| tree | 4aa275fbdbec9c7b9b4629e8bee2bbecd3c6a6af /arch/score/include/asm/bitsperlong.h | |
| parent | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (diff) | |
| parent | 94e0fb086fc5663c38bbc0fe86d698be8314f82f (diff) | |
Merge branch 'origin' into for-linus
Conflicts:
MAINTAINERS
Diffstat (limited to 'arch/score/include/asm/bitsperlong.h')
| -rw-r--r-- | arch/score/include/asm/bitsperlong.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/score/include/asm/bitsperlong.h b/arch/score/include/asm/bitsperlong.h new file mode 100644 index 000000000000..86ff337aa459 --- /dev/null +++ b/arch/score/include/asm/bitsperlong.h | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | #ifndef _ASM_SCORE_BITSPERLONG_H | ||
| 2 | #define _ASM_SCORE_BITSPERLONG_H | ||
| 3 | |||
| 4 | #include <asm-generic/bitsperlong.h> | ||
| 5 | |||
| 6 | #endif /* _ASM_SCORE_BITSPERLONG_H */ | ||