diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-07 05:34:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-07 05:35:05 -0400 |
| commit | 56fdd18c7b89a2fac1dfe5d54750c9143867fdc4 (patch) | |
| tree | ce48eee7d5960936fa6e385320b7a261a8bee071 /arch/blackfin/lib/strncmp.c | |
| parent | 7caf6a49bb17d0377210693af5737563b31aa5ee (diff) | |
| parent | b87297fb405ef13cac375f202d114323b076a56d (diff) | |
Merge branch 'linus' into core/iommu
Merge reason: This branch was on an -rc5 base so pull almost-2.6.30
to resync with the latest upstream fixes and make sure
the combination works fine.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/blackfin/lib/strncmp.c')
| -rw-r--r-- | arch/blackfin/lib/strncmp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/blackfin/lib/strncmp.c b/arch/blackfin/lib/strncmp.c index 2aaae78a68e0..46518b1d2983 100644 --- a/arch/blackfin/lib/strncmp.c +++ b/arch/blackfin/lib/strncmp.c | |||
| @@ -8,9 +8,8 @@ | |||
| 8 | 8 | ||
| 9 | #define strncmp __inline_strncmp | 9 | #define strncmp __inline_strncmp |
| 10 | #include <asm/string.h> | 10 | #include <asm/string.h> |
| 11 | #undef strncmp | ||
| 12 | |||
| 13 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #undef strncmp | ||
| 14 | 13 | ||
| 15 | int strncmp(const char *cs, const char *ct, size_t count) | 14 | int strncmp(const char *cs, const char *ct, size_t count) |
| 16 | { | 15 | { |