--- cauldron/kernel-tmb/current/SPECS/kernel-tmb.spec	2013/04/07 19:49:29	408961
+++ cauldron/kernel-tmb/current/SPECS/kernel-tmb.spec	2013/04/07 20:00:39	408964
@@ -657,13 +657,13 @@
 	cp -fR drivers/lguest/lg.h $TempDevelRoot/drivers/lguest/
 
 	# Needed for lirc_gpio (Anssi Hannula, #39004, #54907)
-	cp -fR drivers/media/pci/bt8xx/bttv{,p}.h $TempDevelRoot/drivers/media/video/bt8xx/
-	cp -fR drivers/media/pci/bt8xx/bt848.h $TempDevelRoot/drivers/media/video/bt8xx/
-	cp -fR drivers/media/i2c/btcx-risc.h $TempDevelRoot/drivers/media/video/
+	cp -fR drivers/media/pci/bt8xx/bttv{,p}.h $TempDevelRoot/drivers/media/pci/bt8xx/
+	cp -fR drivers/media/pci/bt8xx/bt848.h $TempDevelRoot/drivers/media/pci/bt8xx/
+	cp -fR drivers/media/i2c/btcx-risc.h $TempDevelRoot/drivers/media/i2c/
 
 	# Needed for external dvb tree (#41418)
-	cp -fR drivers/media/dvb-core/*.h $TempDevelRoot/drivers/media/dvb/dvb-core/
-	cp -fR drivers/media/frontends/lgdt330x.h $TempDevelRoot/drivers/media/dvb/frontends/
+	cp -fR drivers/media/dvb-core/*.h $TempDevelRoot/drivers/media/dvb-core/
+	cp -fR drivers/media/frontends/lgdt330x.h $TempDevelRoot/drivers/media/frontends/
 
 	# add acpica header files, needed for fglrx build
 	cp -fR drivers/acpi/acpica/*.h $TempDevelRoot/drivers/acpi/acpica/