git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-sa1100
/
generic.c
diff --git
a/arch/arm/mach-sa1100/generic.c
b/arch/arm/mach-sa1100/generic.c
index 16be4c56abe3ff37a153807b93d066c49c0d94ab..9db3e98e8b85dbf8f4c27106e8c3e5ea76d89ccd 100644
(file)
--- a/
arch/arm/mach-sa1100/generic.c
+++ b/
arch/arm/mach-sa1100/generic.c
@@
-359,6
+359,10
@@
static int __init sa1100_init(void)
arch_initcall(sa1100_init);
+void __init sa11x0_init_late(void)
+{
+ sa11x0_pm_init();
+}
/*
* Common I/O mapping: