Merge branches 'core-urgent-for-linus', 'perf-urgent-for-linus' and 'sched-urgent...

[~andy/linux] / drivers / media / radio / radio-tea5764.c

diff --git a/drivers/media/radio/radio-tea5764.c b/drivers/media/radio/radio-tea5764.c
index 95ddcc4845d34d7563b6843ea5f51d8255555cdc..db20904d01f0535fc4a5988b4ff09bf274382987 100644 (file)
--- a/drivers/media/radio/radio-tea5764.c
+++ b/drivers/media/radio/radio-tea5764.c
@@ -128,8 +128,10 @@ struct tea5764_write_regs {
        u16 rdsbbl;                             /* PAUSEDET & RDSBBL */
 } __attribute__ ((packed));
 
-#ifndef RADIO_TEA5764_XTAL
+#ifdef CONFIG_RADIO_TEA5764_XTAL
 #define RADIO_TEA5764_XTAL 1
+#else
+#define RADIO_TEA5764_XTAL 0
 #endif
 
 static int radio_nr = -1;