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 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1...
[pandora-kernel.git]
/
arch
/
arm
/
mach-davinci
/
board-mityomapl138.c
diff --git
a/arch/arm/mach-davinci/board-mityomapl138.c
b/arch/arm/mach-davinci/board-mityomapl138.c
index
2aa79c5
..
606a6f2
100644
(file)
--- a/
arch/arm/mach-davinci/board-mityomapl138.c
+++ b/
arch/arm/mach-davinci/board-mityomapl138.c
@@
-29,7
+29,7
@@
#include <mach/mux.h>
#include <mach/spi.h>
#include <mach/mux.h>
#include <mach/spi.h>
-#define MITYOMAPL138_PHY_ID "
0:03
"
+#define MITYOMAPL138_PHY_ID ""
#define FACTORY_CONFIG_MAGIC 0x012C0138
#define FACTORY_CONFIG_VERSION 0x00010001
#define FACTORY_CONFIG_MAGIC 0x012C0138
#define FACTORY_CONFIG_VERSION 0x00010001
@@
-414,7
+414,7
@@
static struct resource mityomapl138_nandflash_resource[] = {
static struct platform_device mityomapl138_nandflash_device = {
.name = "davinci_nand",
static struct platform_device mityomapl138_nandflash_device = {
.name = "davinci_nand",
- .id =
0
,
+ .id =
1
,
.dev = {
.platform_data = &mityomapl138_nandflash_data,
},
.dev = {
.platform_data = &mityomapl138_nandflash_data,
},