Skip to content

Commit

Permalink
[media] cx25821: remove cx25821-audio-upstream.c from the Makefile
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed Apr 16, 2013
1 parent ea3f7ac commit 486a7a2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
3 changes: 1 addition & 2 deletions drivers/media/pci/cx25821/Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 0 additions & 2 deletions drivers/media/pci/cx25821/cx25821-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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++) {
Expand Down

0 comments on commit 486a7a2

Please sign in to comment.