summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-09-07 01:52:38 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-07 01:52:38 -0300
commit5217d99ecf26180c5bee9bf25cfb9212c2c5c1b1 (patch)
tree408074b356ba07944eaff4a0ca4ea83f1e8470f5
parent025122531cb66f05517e9d1f98e45df3e993fb76 (diff)
parent2518e6d5dd10b13a5598b37a58e1e53aa5699270 (diff)
downloadmediapointer-dvb-s2-5217d99ecf26180c5bee9bf25cfb9212c2c5c1b1.tar.gz
mediapointer-dvb-s2-5217d99ecf26180c5bee9bf25cfb9212c2c5c1b1.tar.bz2
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--linux/arch/sh/boards/board-ap325rxa.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/arch/sh/boards/board-ap325rxa.c b/linux/arch/sh/boards/board-ap325rxa.c
index 21469489d..96e5bae1c 100644
--- a/linux/arch/sh/boards/board-ap325rxa.c
+++ b/linux/arch/sh/boards/board-ap325rxa.c
@@ -359,8 +359,8 @@ static void ap325rxa_camera_del(struct soc_camera_link *icl)
return;
platform_device_unregister(&camera_device);
- memset(&migor_camera_device.dev.kobj, 0,
- sizeof(migor_camera_device.dev.kobj));
+ memset(&camera_device.dev.kobj, 0,
+ sizeof(camera_device.dev.kobj));
}
#endif /* CONFIG_I2C */