diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-06 22:32:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-06 22:32:33 -0500 |
commit | ce4796d1e16cf3761dc2a02b8d588667d05b3078 (patch) | |
tree | 823d7012c6311c96eaf2041cf2b04558abbaec15 /arch/sh/kernel/io_trapped.c | |
parent | 46fbdf8935544dcde440bd807b50e52ed2ca7f3b (diff) | |
parent | 7b9726a7a0d8c70ea44a5ed23726748de344f223 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.25:
sh: Fix up the sh64 build.
sh: Fix up SH7710 VoIP-GW build.
sh: Flag PMB support as EXPERIMENTAL.
sh: Update r7780mp defconfig.
fb: hitfb: Balance probe/remove section annotations.
sh: hp6xx: Fix up hp6xx_apm build failure.
fb: pvr2fb: Fix up remaining section mismatch.
sh: Fix up section mismatches.
sh: hp6xx: Correct APM output.
sh: update se7780 defconfig
sh: replace remaining __FUNCTION__ occurrences
sh: export copy-page() to modules
sh_ksyms_32.c update for gcc 4.3
sh/mm/pg-sh7705.c must #include <linux/fs.h>
Diffstat (limited to 'arch/sh/kernel/io_trapped.c')
-rw-r--r-- | arch/sh/kernel/io_trapped.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/io_trapped.c b/arch/sh/kernel/io_trapped.c index 86a665d92201..39cd7f3aec7b 100644 --- a/arch/sh/kernel/io_trapped.c +++ b/arch/sh/kernel/io_trapped.c | |||
@@ -32,7 +32,7 @@ EXPORT_SYMBOL_GPL(trapped_mem); | |||
32 | #endif | 32 | #endif |
33 | static DEFINE_SPINLOCK(trapped_lock); | 33 | static DEFINE_SPINLOCK(trapped_lock); |
34 | 34 | ||
35 | int __init register_trapped_io(struct trapped_io *tiop) | 35 | int register_trapped_io(struct trapped_io *tiop) |
36 | { | 36 | { |
37 | struct resource *res; | 37 | struct resource *res; |
38 | unsigned long len = 0, flags = 0; | 38 | unsigned long len = 0, flags = 0; |