Merge branch 'origin'

Conflicts:
	Documentation/video4linux/CARDLIST.cx88
	drivers/media/video/cx88/Kconfig
	drivers/media/video/em28xx/em28xx-video.c
	drivers/media/video/saa7134/saa7134-dvb.c

Resolved as in the original merge by Mauro Carvalho Chehab

1 files changed, 3 insertions, 9 deletions

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 01bc7d589afe..e9b275d90737 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -392,18 +392,12 @@ config SH_TMU
 
 endmenu
 
-source "arch/sh/boards/renesas/hs7751rvoip/Kconfig"
+#source "arch/sh/boards/renesas/hs7751rvoip/Kconfig"
 
-source "arch/sh/boards/renesas/rts7751r2d/Kconfig"
-
-config SH_PCLK_FREQ_BOOL
-        bool "Set default pclk frequency"
-        default y if !SH_RTC
-        default n
+#source "arch/sh/boards/renesas/rts7751r2d/Kconfig"
 
 config SH_PCLK_FREQ
         int "Peripheral clock frequency (in Hz)"
-        depends on SH_PCLK_FREQ_BOOL
         default "50000000" if CPU_SUBTYPE_SH7750 || CPU_SUBTYPE_SH7780
         default "60000000" if CPU_SUBTYPE_SH7751
         default "33333333" if CPU_SUBTYPE_SH7300 || CPU_SUBTYPE_SH7770 || CPU_SUBTYPE_SH7760
@@ -452,7 +446,7 @@ endmenu
 
 config ISA_DMA_API
         bool
-        depends on MPC1211
+        depends on SH_MPC1211
         default y
 
 menu "Kernel features"