diff options
| author | Dennis Munsie <dmunsie@cecropia.com> | 2006-06-20 14:55:55 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-07-03 19:04:37 +1000 |
| commit | 1f6e8449e11fd79ee30456ce7ec973317b8dd6ae (patch) | |
| tree | a795e58b085a515762ac494e6d06651b60a5336f | |
| parent | 41c9480a1d22e8f28b8675a2d7ec7fd4c50bc900 (diff) | |
| download | linux-1f6e8449e11fd79ee30456ce7ec973317b8dd6ae.tar.bz2 | |
intelfb: add preliminary i2c support
[07/07] intelfb: adds an option to enable I2C support in the intelfb driver. Also adds
the intel_i2c.c file to the Makefile.
Signed-off-by: Dennis Munsie <dmunsie@cecropia.com>
| -rw-r--r-- | drivers/video/Kconfig | 20 | ||||
| -rw-r--r-- | drivers/video/intelfb/Makefile | 4 |
2 files changed, 21 insertions, 3 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 5a2840aeb547..743c853ad150 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -809,6 +809,8 @@ config FB_INTEL depends on FB && EXPERIMENTAL && PCI && X86 select AGP select AGP_INTEL + select I2C_ALGOBIT if FB_INTEL_I2C + select I2C if FB_INTEL_I2C select FB_MODE_HELPERS select FB_CFB_FILLRECT select FB_CFB_COPYAREA @@ -818,17 +820,31 @@ config FB_INTEL 830M/845G/852GM/855GM/865G chipsets. Say Y if you have and plan to use such a board. - To compile this driver as a module, choose M here: the + If you say Y here and want DDC/I2C support you must first say Y to + "I2C support" and "I2C bit-banging support" in the character devices + section. + + If you say M here then "I2C support" and "I2C bit-banging support" + can be build either as modules or built-in. + + To compile this driver as a module, choose M here: the module will be called intelfb. config FB_INTEL_DEBUG - bool "Intel driver Debug Messages" + bool "Intel driver Debug Messages" depends on FB_INTEL ---help--- Say Y here if you want the Intel driver to output all sorts of debugging informations to provide to the maintainer when something goes wrong. +config FB_INTEL_I2C + bool "DDC/I2C for Intel framebuffer support" + depends on FB_INTEL + default y + help + Say Y here if you want DDC/I2C support for your on-board Intel graphics. + config FB_MATROX tristate "Matrox acceleration" depends on FB && PCI diff --git a/drivers/video/intelfb/Makefile b/drivers/video/intelfb/Makefile index 722d21d6e5cd..6c782d3ae1be 100644 --- a/drivers/video/intelfb/Makefile +++ b/drivers/video/intelfb/Makefile @@ -1,6 +1,8 @@ obj-$(CONFIG_FB_INTEL) += intelfb.o -intelfb-objs := intelfbdrv.o intelfbhw.o +intelfb-y := intelfbdrv.o intelfbhw.o +intelfb-$(CONFIG_FB_INTEL_I2C) += intelfb_i2c.o +intelfb-objs := $(intelfb-y) ifdef CONFIG_FB_INTEL_DEBUG #EXTRA_CFLAGS += -DDEBUG -DVERBOSE -DREGDUMP |