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/jejb/scsi-misc-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
em-x270.c
diff --git
a/arch/arm/mach-pxa/em-x270.c
b/arch/arm/mach-pxa/em-x270.c
index
ab48bb8
..
ed0dbfd
100644
(file)
--- a/
arch/arm/mach-pxa/em-x270.c
+++ b/
arch/arm/mach-pxa/em-x270.c
@@
-1015,7
+1015,6
@@
static struct soc_camera_link iclink = {
.power = em_x270_sensor_power,
.board_info = &em_x270_i2c_cam_info[0],
.i2c_adapter_id = 0,
- .module_name = "mt9m111",
};
static struct platform_device em_x270_camera = {