git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'at91', 'ixp', 'master', 'misc', 'pxa' and 'realview' into devel
[safe/jmp/linux-2.6]
/
arch
/
arm
/
mach-sa1100
/
generic.c
diff --git
a/arch/arm/mach-sa1100/generic.c
b/arch/arm/mach-sa1100/generic.c
index
9e13c83
..
5c84c60
100644
(file)
--- a/
arch/arm/mach-sa1100/generic.c
+++ b/
arch/arm/mach-sa1100/generic.c
@@
-470,7
+470,7
@@
void __init sa1110_mb_disable(void)
* If the system is going to use the SA-1111 DMA engines, set up
* the memory bus request/grant pins.
*/
-void __init sa1110_mb_enable(void)
+void __
dev
init sa1110_mb_enable(void)
{
unsigned long flags;