diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-04-28 00:01:34 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-04-28 00:01:34 -0400 |
| commit | 1dbbb6077426f8ce63d6a59c5ac6613e1689cbde (patch) | |
| tree | 6141d4d7a8eb7c557705bdfa764137d4fd2e4924 /include/asm-s390/bitops.h | |
| parent | d09e860cf07e7c9ee12920a09f5080e30a12a23a (diff) | |
| parent | 064922a805ec7aadfafdd27aa6b4908d737c3c1d (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-s390/bitops.h')
| -rw-r--r-- | include/asm-s390/bitops.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-s390/bitops.h b/include/asm-s390/bitops.h index 965394e69452..b4eb24ab5af9 100644 --- a/include/asm-s390/bitops.h +++ b/include/asm-s390/bitops.h | |||
| @@ -769,6 +769,7 @@ static inline int sched_find_first_bit(unsigned long *b) | |||
| 769 | } | 769 | } |
| 770 | 770 | ||
| 771 | #include <asm-generic/bitops/fls.h> | 771 | #include <asm-generic/bitops/fls.h> |
| 772 | #include <asm-generic/bitops/__fls.h> | ||
| 772 | #include <asm-generic/bitops/fls64.h> | 773 | #include <asm-generic/bitops/fls64.h> |
| 773 | 774 | ||
| 774 | #include <asm-generic/bitops/hweight.h> | 775 | #include <asm-generic/bitops/hweight.h> |