git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
m68k
/
platform
/
520x
/
config.c
diff --git
a/arch/m68k/platform/520x/config.c
b/arch/m68k/platform/520x/config.c
index
621238f
..
8a98683
100644
(file)
--- a/
arch/m68k/platform/520x/config.c
+++ b/
arch/m68k/platform/520x/config.c
@@
-91,9
+91,9
@@
static struct resource m520x_qspi_resources[] = {
},
};
-#define MCFQSPI_CS0
62
-#define MCFQSPI_CS1
63
-#define MCFQSPI_CS2
44
+#define MCFQSPI_CS0
46
+#define MCFQSPI_CS1
47
+#define MCFQSPI_CS2
27
static int m520x_cs_setup(struct mcfqspi_cs_control *cs_control)
{