Commit 31c67c75 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 

* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
  initramfs: Really fix build break on symbol-prefixed archs
  [media] Fix Kconfig errors due to two visible menus
  i2c/algos: convert Kconfig to use the menu's `visible' keyword
  media/video: convert Kconfig to use the menu's `visible' keyword
  Revert "i2c: Fix Kconfig dependencies"
  kconfig: regen parser
  kconfig: add an option to determine a menu's visibility
parents 47ad504c 30799105

drivers/i2c/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -75,8 +75,7 @@ config I2C_HELPER_AUTO 
	  In doubt, say Y.



config I2C_SMBUS

	tristate

	prompt "SMBus-specific protocols" if !I2C_HELPER_AUTO

	tristate "SMBus-specific protocols" if !I2C_HELPER_AUTO

	help

	  Say Y here if you want support for SMBus extensions to the I2C

	  specification. At the moment, the only supported extension is

drivers/i2c/algos/Kconfig

+1 −13
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#



menu "I2C Algorithms"

	depends on !I2C_HELPER_AUTO

	visible if !I2C_HELPER_AUTO



config I2C_ALGOBIT

	tristate "I2C bit-banging interfaces"
@@ -15,15 +15,3 @@ config I2C_ALGOPCA 
	tristate "I2C PCA 9564 interfaces"



endmenu
 


# In automatic configuration mode, we still have to define the

# symbols to avoid unmet dependencies.



if I2C_HELPER_AUTO

config I2C_ALGOBIT

	tristate

config I2C_ALGOPCF

	tristate

config I2C_ALGOPCA

	tristate

endif

drivers/media/common/tuners/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ config MEDIA_TUNER 
	select MEDIA_TUNER_TDA9887 if !MEDIA_TUNER_CUSTOMISE

	select MEDIA_TUNER_MC44S803 if !MEDIA_TUNER_CUSTOMISE



menuconfig MEDIA_TUNER_CUSTOMISE

config MEDIA_TUNER_CUSTOMISE

	bool "Customize analog and hybrid tuner modules to build"

	depends on MEDIA_TUNER

	default y if EMBEDDED
@@ -44,7 +44,8 @@ menuconfig MEDIA_TUNER_CUSTOMISE 


	  If unsure say N.



if MEDIA_TUNER_CUSTOMISE

menu "Customize TV tuners"

	visible if MEDIA_TUNER_CUSTOMISE



config MEDIA_TUNER_SIMPLE

	tristate "Simple tuner support"
@@ -185,5 +186,4 @@ config MEDIA_TUNER_TDA18218 
	default m if MEDIA_TUNER_CUSTOMISE

	help

	  NXP TDA18218 silicon tuner driver.



endif # MEDIA_TUNER_CUSTOMISE
 
endmenu

drivers/media/dvb/frontends/Kconfig

+1 −4
Original line number Diff line number Diff line
@@ -12,9 +12,8 @@ config DVB_FE_CUSTOMISE 


	  If unsure say N.



if DVB_FE_CUSTOMISE



menu "Customise DVB Frontends"

	visible if DVB_FE_CUSTOMISE



comment "Multistandard (satellite) frontends"

	depends on DVB_CORE
@@ -619,5 +618,3 @@ config DVB_DUMMY_FE 
	tristate "Dummy frontend driver"

	default n

endmenu
 


endif

drivers/media/video/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ config VIDEO_IR_I2C 
#



menu "Encoders/decoders and other helper chips"

	depends on !VIDEO_HELPER_CHIPS_AUTO

	visible if !VIDEO_HELPER_CHIPS_AUTO



comment "Audio decoders"

CRA Git | Maintained and supported by SUSTech CRA and CCSE