projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6
[platform/kernel/linux-starfive.git]
/
arch
/
arm
/
mach-at91
/
pm_slowclock.S
diff --git
a/arch/arm/mach-at91/pm_slowclock.S
b/arch/arm/mach-at91/pm_slowclock.S
index
db54521
..
098c28d
100644
(file)
--- a/
arch/arm/mach-at91/pm_slowclock.S
+++ b/
arch/arm/mach-at91/pm_slowclock.S
@@
-18,7
+18,7
@@
#include <mach/at91_ramc.h>
-#ifdef CONFIG_
ARCH
_AT91SAM9263
+#ifdef CONFIG_
SOC
_AT91SAM9263
/*
* FIXME either or both the SDRAM controllers (EB0, EB1) might be in use;
* handle those cases both here and in the Suspend-To-RAM support.