diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-25 19:41:21 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-25 19:41:21 -0400 |
| commit | ae1d3b974e091b5fc9008bd41bcbdaac68110b62 (patch) | |
| tree | 82e50a66925ced79f59ed4504f6e073ef55edee3 /arch/m68k/lib/memmove.c | |
| parent | 586893ebc42943008010b4c210cfc9167df615e5 (diff) | |
| parent | 7a2207a0e1142a9b214b323e43ab2ecc592e5b0e (diff) | |
Merge branch 'for-rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable
Diffstat (limited to 'arch/m68k/lib/memmove.c')
| -rw-r--r-- | arch/m68k/lib/memmove.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/m68k/lib/memmove.c b/arch/m68k/lib/memmove.c index b3dcfe9dab7e..6519f7f349f6 100644 --- a/arch/m68k/lib/memmove.c +++ b/arch/m68k/lib/memmove.c | |||
| @@ -4,8 +4,6 @@ | |||
| 4 | * for more details. | 4 | * for more details. |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #define __IN_STRING_C | ||
| 8 | |||
| 9 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 10 | #include <linux/string.h> | 8 | #include <linux/string.h> |
| 11 | 9 | ||