Merge remote-tracking branch 'workqueues/for-next'

[karo-tx-linux.git] / drivers / media / pci / saa7134 / saa7134-core.c

diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/pci/saa7134/saa7134-core.c
similarity index 100%
rename from drivers/media/video/saa7134/saa7134-core.c
rename to drivers/media/pci/saa7134/saa7134-core.c