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 git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx3
/
mx31moboard-marxbot.c
diff --git
a/arch/arm/mach-mx3/mx31moboard-marxbot.c
b/arch/arm/mach-mx3/mx31moboard-marxbot.c
index
0551eb3
..
18069cb
100644
(file)
--- a/
arch/arm/mach-mx3/mx31moboard-marxbot.c
+++ b/
arch/arm/mach-mx3/mx31moboard-marxbot.c
@@
-179,7
+179,6
@@
static struct soc_camera_link base_iclink = {
.reset = marxbot_basecam_reset,
.board_info = &marxbot_i2c_devices[0],
.i2c_adapter_id = 0,
- .module_name = "mt9t031",
};
static struct platform_device marxbot_camera[] = {