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/kernel/entry_no.S | |
| 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/kernel/entry_no.S')
| -rw-r--r-- | arch/m68k/kernel/entry_no.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/kernel/entry_no.S b/arch/m68k/kernel/entry_no.S index 2783f25e38b..5f0f6b598b5 100644 --- a/arch/m68k/kernel/entry_no.S +++ b/arch/m68k/kernel/entry_no.S | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | * linux 2.4 support David McCullough <davidm@snapgear.com> | 24 | * linux 2.4 support David McCullough <davidm@snapgear.com> |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/sys.h> | ||
| 28 | #include <linux/linkage.h> | 27 | #include <linux/linkage.h> |
| 29 | #include <asm/errno.h> | 28 | #include <asm/errno.h> |
| 30 | #include <asm/setup.h> | 29 | #include <asm/setup.h> |