diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2010-02-10 12:53:57 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-17 23:43:57 -0400 |
commit | 29ec15e90ba9e20ff33da4824c32721bbc6bcfad (patch) | |
tree | 33ba5eb40b5f8002e96f994866b8a28c3ca8bc8f | |
parent | e3ee9e5ec17767a24848035a1d759af8a03c971f (diff) |
V4L/DVB: tm6000: fix build errors
(1) tm6000 uses usb_*() interfaces, so it should depend on USB.
drivers/built-in.o: In function `tm6000_usb_disconnect':
tm6000-cards.c:(.text+0x4abb44): undefined reference to `usb_put_dev'
drivers/built-in.o: In function `tm6000_usb_probe':
tm6000-cards.c:(.text+0x4ac923): undefined reference to `usb_get_dev'
tm6000-cards.c:(.text+0x4ac93c): undefined reference to `usb_set_interface'
drivers/built-in.o: In function `tm6000_read_write_usb':
(.text+0x4ad274): undefined reference to `usb_control_msg'
drivers/built-in.o: In function `tm6000_uninit_isoc':
tm6000-video.c:(.text+0x4b00d5): undefined reference to `usb_kill_urb'
tm6000-video.c:(.text+0x4b00e4): undefined reference to `usb_unlink_urb'
tm6000-video.c:(.text+0x4b013c): undefined reference to `usb_buffer_free'
tm6000-video.c:(.text+0x4b014b): undefined reference to `usb_free_urb'
drivers/built-in.o: In function `tm6000_prepare_isoc':
tm6000-video.c:(.text+0x4b0773): undefined reference to `usb_alloc_urb'
tm6000-video.c:(.text+0x4b0835): undefined reference to `usb_buffer_alloc'
drivers/built-in.o: In function `tm6000_irq_callback':
tm6000-video.c:(.text+0x4b1ad3): undefined reference to `usb_submit_urb'
drivers/built-in.o: In function `tm6000_module_init':
tm6000-cards.c:(.init.text+0x24499): undefined reference to `usb_register_driver'
drivers/built-in.o: In function `tm6000_module_exit':
tm6000-cards.c:(.exit.text+0x5cb0): undefined reference to `usb_deregister'
(2) tm6000-alsa uses interfaces from tm6000-core, so when they are
both built as modules, the core interfaces need to be exported.
ERROR: "tm6000_set_reg" [drivers/staging/tm6000/tm6000-alsa.ko] undefined!
ERROR: "tm6000_get_reg" [drivers/staging/tm6000/tm6000-alsa.ko] undefined!
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>, linux-media@vger.kernel.org
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: Michel Ludwig <michel.ludwig@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/staging/tm6000/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/tm6000/tm6000-core.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/tm6000/Kconfig b/drivers/staging/tm6000/Kconfig index cb2011536363..5fe759cc2ee9 100644 --- a/drivers/staging/tm6000/Kconfig +++ b/drivers/staging/tm6000/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config VIDEO_TM6000 | 1 | config VIDEO_TM6000 |
2 | tristate "TV Master TM5600/6000/6010 driver" | 2 | tristate "TV Master TM5600/6000/6010 driver" |
3 | depends on VIDEO_DEV && I2C && INPUT && EXPERIMENTAL | 3 | depends on VIDEO_DEV && I2C && INPUT && USB && EXPERIMENTAL |
4 | select VIDEO_TUNER | 4 | select VIDEO_TUNER |
5 | select TUNER_XC2028 | 5 | select TUNER_XC2028 |
6 | select VIDEOBUF_VMALLOC | 6 | select VIDEOBUF_VMALLOC |
diff --git a/drivers/staging/tm6000/tm6000-core.c b/drivers/staging/tm6000/tm6000-core.c index 9d66a3fc091d..afd03929e5a8 100644 --- a/drivers/staging/tm6000/tm6000-core.c +++ b/drivers/staging/tm6000/tm6000-core.c | |||
@@ -108,6 +108,7 @@ int tm6000_set_reg (struct tm6000_core *dev, u8 req, u16 value, u16 index) | |||
108 | tm6000_read_write_usb (dev, USB_DIR_OUT | USB_TYPE_VENDOR, | 108 | tm6000_read_write_usb (dev, USB_DIR_OUT | USB_TYPE_VENDOR, |
109 | req, value, index, NULL, 0); | 109 | req, value, index, NULL, 0); |
110 | } | 110 | } |
111 | EXPORT_SYMBOL_GPL(tm6000_set_reg); | ||
111 | 112 | ||
112 | int tm6000_get_reg (struct tm6000_core *dev, u8 req, u16 value, u16 index) | 113 | int tm6000_get_reg (struct tm6000_core *dev, u8 req, u16 value, u16 index) |
113 | { | 114 | { |
@@ -122,6 +123,7 @@ int tm6000_get_reg (struct tm6000_core *dev, u8 req, u16 value, u16 index) | |||
122 | 123 | ||
123 | return *buf; | 124 | return *buf; |
124 | } | 125 | } |
126 | EXPORT_SYMBOL_GPL(tm6000_get_reg); | ||
125 | 127 | ||
126 | int tm6000_get_reg16 (struct tm6000_core *dev, u8 req, u16 value, u16 index) | 128 | int tm6000_get_reg16 (struct tm6000_core *dev, u8 req, u16 value, u16 index) |
127 | { | 129 | { |