include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[safe/jmp/linux-2.6] / drivers / media / dvb / dvb-usb / af9015.c

diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c
index b926473..74d94e4 100644 (file)
--- a/drivers/media/dvb/dvb-usb/af9015.c
+++ b/drivers/media/dvb/dvb-usb/af9015.c
@@ -22,6 +22,7 @@
  */
 
 #include <linux/hash.h>
+#include <linux/slab.h>
 
 #include "af9015.h"
 #include "af9013.h"
@@ -795,6 +796,9 @@ static const struct af9015_setup af9015_setup_hashes[] = {
        { 0xa3703d00,
                af9015_rc_keys_a_link, ARRAY_SIZE(af9015_rc_keys_a_link),
                af9015_ir_table_a_link, ARRAY_SIZE(af9015_ir_table_a_link) },
+       { 0x9b7dc64e,
+               af9015_rc_keys_mygictv, ARRAY_SIZE(af9015_rc_keys_mygictv),
+               af9015_ir_table_mygictv, ARRAY_SIZE(af9015_ir_table_mygictv) },
        { }
 };
 
@@ -823,13 +827,7 @@ static void af9015_set_remote_config(struct usb_device *udev,
                        memset(manufacturer, 0, sizeof(manufacturer));
                        usb_string(udev, udev->descriptor.iManufacturer,
                                manufacturer, sizeof(manufacturer));
-                       if (!strcmp("Geniatech", manufacturer)) {
-                               /* iManufacturer 1 Geniatech
-                                  iProduct      2 AF9015 */
-                               table = af9015_setup_match(
-                                       AF9015_REMOTE_MYGICTV_U718,
-                                       af9015_setup_modparam);
-                       } else if (!strcmp("MSI", manufacturer)) {
+                       if (!strcmp("MSI", manufacturer)) {
                                /* iManufacturer 1 MSI
                                   iProduct      2 MSI K-VOX */
                                table = af9015_setup_match(
@@ -1005,6 +1003,9 @@ static int af9015_read_config(struct usb_device *udev)
                        af9015_af9013_config[i].gpio[1] = AF9013_GPIO_LO;
                        af9015_af9013_config[i].rf_spec_inv = 1;
                        break;
+               case AF9013_TUNER_TDA18218:
+                       warn("tuner NXP TDA18218 not supported yet");
+                       return -ENODEV;
                default:
                        warn("tuner id:%d not supported, please report!", val);
                        return -ENODEV;