4 files changed, 5 insertions, 87 deletions

diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig
index 772990415f99..68eb4493f991 100644
--- a/drivers/media/dvb/ttpci/Kconfig
+++ b/drivers/media/dvb/ttpci/Kconfig
@@ -28,25 +28,12 @@ config DVB_AV7110
           download/extract it, and then copy it to /usr/lib/hotplug/firmware
           or /lib/firmware (depending on configuration of firmware hotplug).
 
-          Say Y if you own such a card and want to use it.
-
-config DVB_AV7110_FIRMWARE
-        bool "Compile AV7110 firmware into the driver"
-        depends on DVB_AV7110 && !STANDALONE
-        default y if DVB_AV7110=y
-        help
-          The AV7110 firmware is normally loaded by the firmware hotplug manager.
-          If you want to compile the firmware into the driver you need to say
-          Y here and provide the correct path of the firmware. You need this
-          option if you want to compile the whole driver statically into the
-          kernel.
+          Alternatively, you can download the file and use the kernel's
+          EXTRA_FIRMWARE configuration option to build it into your
+          kernel image by adding the filename to the EXTRA_FIRMWARE
+          configuration option string.
 
-          All other people say N.
-
-config DVB_AV7110_FIRMWARE_FILE
-        string "Full pathname of av7110 firmware file"
-        depends on DVB_AV7110_FIRMWARE
-        default "/usr/lib/hotplug/firmware/dvb-ttpci-01.fw"
+          Say Y if you own such a card and want to use it.
 
 config DVB_AV7110_OSD
         bool "AV7110 OSD support"
diff --git a/drivers/media/dvb/ttpci/Makefile b/drivers/media/dvb/ttpci/Makefile
index 71451237294c..8a4d5bb20a5b 100644
--- a/drivers/media/dvb/ttpci/Makefile
+++ b/drivers/media/dvb/ttpci/Makefile
@@ -19,12 +19,3 @@ obj-$(CONFIG_DVB_AV7110) += dvb-ttpci.o
 
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
 EXTRA_CFLAGS += -Idrivers/media/common/tuners
-
-hostprogs-y     := fdump
-
-ifeq ($(CONFIG_DVB_AV7110_FIRMWARE),y)
-$(obj)/av7110.o: $(obj)/av7110_firm.h
-
-$(obj)/av7110_firm.h: $(obj)/fdump
-        $(obj)/fdump $(CONFIG_DVB_AV7110_FIRMWARE_FILE) dvb_ttpci_fw $@
-endif
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 4624cee93e74..d1d959ed37b7 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -1518,20 +1518,6 @@ static int check_firmware(struct av7110* av7110)
         return 0;
 }
 
-#ifdef CONFIG_DVB_AV7110_FIRMWARE_FILE
-#include "av7110_firm.h"
-static void put_firmware(struct av7110* av7110)
-{
-        av7110->bin_fw = NULL;
-}
-
-static inline int get_firmware(struct av7110* av7110)
-{
-        av7110->bin_fw = dvb_ttpci_fw;
-        av7110->size_fw = sizeof(dvb_ttpci_fw);
-        return check_firmware(av7110);
-}
-#else
 static void put_firmware(struct av7110* av7110)
 {
         vfree(av7110->bin_fw);
@@ -1580,8 +1566,6 @@ static int get_firmware(struct av7110* av7110)
         release_firmware(fw);
         return ret;
 }
-#endif
-
 
 static int alps_bsrv2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params)
 {
diff --git a/drivers/media/dvb/ttpci/fdump.c b/drivers/media/dvb/ttpci/fdump.c
deleted file mode 100644
index c90001d35e7d..000000000000
--- a/drivers/media/dvb/ttpci/fdump.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-int main(int argc, char **argv)
-{
-    unsigned char buf[8];
-    unsigned int i, count, bytes = 0;
-    FILE *fd_in, *fd_out;
-
-    if (argc != 4) {
-        fprintf(stderr, "\n\tusage: %s <ucode.bin> <array_name> <output_name>\n\n", argv[0]);
-        return -1;
-    }
-
-    fd_in = fopen(argv[1], "rb");
-    if (fd_in == NULL) {
-        fprintf(stderr, "firmware file '%s' not found\n", argv[1]);
-        return -1;
-    }
-
-    fd_out = fopen(argv[3], "w+");
-    if (fd_out == NULL) {
-        fprintf(stderr, "cannot create output file '%s'\n", argv[3]);
-        return -1;
-    }
-
-    fprintf(fd_out, "\n#include <asm/types.h>\n\nu8 %s [] = {", argv[2]);
-
-    while ((count = fread(buf, 1, 8, fd_in)) > 0) {
-        fprintf(fd_out, "\n\t");
-        for (i = 0; i < count; i++, bytes++)
-            fprintf(fd_out, "0x%02x, ", buf[i]);
-    }
-
-    fprintf(fd_out, "\n};\n\n");
-
-    fclose(fd_in);
-    fclose(fd_out);
-
-    return 0;
-}