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 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-sa1100
/
collie.c
diff --git
a/arch/arm/mach-sa1100/collie.c
b/arch/arm/mach-sa1100/collie.c
index
d43c5ef
..
bd3e1bf
100644
(file)
--- a/
arch/arm/mach-sa1100/collie.c
+++ b/
arch/arm/mach-sa1100/collie.c
@@
-241,6
+241,9
@@
static struct locomo_platform_data locomo_info = {
struct platform_device collie_locomo_device = {
.name = "locomo",
.id = 0,
+ .dev = {
+ .platform_data = &locomo_info,
+ },
.num_resources = ARRAY_SIZE(locomo_resources),
.resource = locomo_resources,
};