Commit b1c059c1 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] radeon config fix

From: Herbert Xu <herbert@gondor.apana.org.au>

RADEON is selecting I2C_ALGOBIT but as kconfig currently does not propagate
selects up the dependency chain (that is according to Roman), this can
leave I2C as m while I2C_ALGOBIT is y.
parent a79e9d88
...@@ -462,7 +462,6 @@ config FB_I810_GTF ...@@ -462,7 +462,6 @@ config FB_I810_GTF
config FB_MATROX config FB_MATROX
tristate "Matrox acceleration" tristate "Matrox acceleration"
depends on FB && PCI depends on FB && PCI
select I2C_ALGOBIT if FB_MATROX_I2C
---help--- ---help---
Say Y here if you have a Matrox Millennium, Matrox Millennium II, Say Y here if you have a Matrox Millennium, Matrox Millennium II,
Matrox Mystique, Matrox Mystique 220, Matrox Productiva G100, Matrox Matrox Mystique, Matrox Mystique 220, Matrox Productiva G100, Matrox
...@@ -550,6 +549,7 @@ config FB_MATROX_G100 ...@@ -550,6 +549,7 @@ config FB_MATROX_G100
config FB_MATROX_I2C config FB_MATROX_I2C
tristate "Matrox I2C support" tristate "Matrox I2C support"
depends on FB_MATROX && I2C depends on FB_MATROX && I2C
select I2C_ALGOBIT
---help--- ---help---
This drivers creates I2C buses which are needed for accessing the This drivers creates I2C buses which are needed for accessing the
DDC (I2C) bus present on all Matroxes, an I2C bus which DDC (I2C) bus present on all Matroxes, an I2C bus which
...@@ -628,6 +628,7 @@ config FB_RADEON ...@@ -628,6 +628,7 @@ config FB_RADEON
tristate "ATI Radeon display support" tristate "ATI Radeon display support"
depends on FB && PCI depends on FB && PCI
select I2C_ALGOBIT if FB_RADEON_I2C select I2C_ALGOBIT if FB_RADEON_I2C
select I2C if FB_RADEON_I2C
help help
Choose this option if you want to use an ATI Radeon graphics card as Choose this option if you want to use an ATI Radeon graphics card as
a framebuffer device. There are both PCI and AGP versions. You a framebuffer device. There are both PCI and AGP versions. You
...@@ -645,7 +646,7 @@ config FB_RADEON ...@@ -645,7 +646,7 @@ config FB_RADEON
config FB_RADEON_I2C config FB_RADEON_I2C
bool "DDC/I2C for ATI Radeon support" bool "DDC/I2C for ATI Radeon support"
depends on FB_RADEON && I2C depends on FB_RADEON
default y default y
help help
Say Y here if you want DDC/I2C support for your Radeon board. Say Y here if you want DDC/I2C support for your Radeon board.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment