diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-04-14 12:47:57 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-04-16 18:13:06 -0300 |
| commit | 486a7a2813c7d6e0b864c4b51027bcae3359071e (patch) | |
| tree | 95659c61248b149644922d576455df0ff58f717f /drivers | |
| parent | ea3f7ac6e931f9aaa45e0a8445406f14e2a62011 (diff) | |
| download | linux-stable-486a7a2813c7d6e0b864c4b51027bcae3359071e.tar.gz linux-stable-486a7a2813c7d6e0b864c4b51027bcae3359071e.tar.bz2 linux-stable-486a7a2813c7d6e0b864c4b51027bcae3359071e.zip | |
[media] cx25821: remove cx25821-audio-upstream.c from the Makefile
The audio output is currently not used as this should be rewritten as an
alsa driver. For the time being remove this source from the Makefile.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/pci/cx25821/Makefile | 3 | ||||
| -rw-r--r-- | drivers/media/pci/cx25821/cx25821-core.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/pci/cx25821/Makefile b/drivers/media/pci/cx25821/Makefile index 407830c89df4..fb76c3d3713a 100644 --- a/drivers/media/pci/cx25821/Makefile +++ b/drivers/media/pci/cx25821/Makefile @@ -1,7 +1,6 @@ cx25821-y := cx25821-core.o cx25821-cards.o cx25821-i2c.o \ cx25821-gpio.o cx25821-medusa-video.o \ - cx25821-video.o cx25821-video-upstream.o \ - cx25821-audio-upstream.o + cx25821-video.o cx25821-video-upstream.o obj-$(CONFIG_VIDEO_CX25821) += cx25821.o obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o diff --git a/drivers/media/pci/cx25821/cx25821-core.c b/drivers/media/pci/cx25821/cx25821-core.c index 35bea792b5e4..b762c5b2ca10 100644 --- a/drivers/media/pci/cx25821/cx25821-core.c +++ b/drivers/media/pci/cx25821/cx25821-core.c @@ -964,8 +964,6 @@ void cx25821_dev_unregister(struct cx25821_dev *dev) if (!dev->base_io_addr) return; - cx25821_free_mem_upstream_audio(dev); - release_mem_region(dev->base_io_addr, pci_resource_len(dev->pci, 0)); for (i = 0; i < MAX_VID_CHANNEL_NUM - 1; i++) { |