diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-30 12:36:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-30 12:36:56 -0400 |
| commit | db1a19b38f3a85f475b4ad716c71be133d8ca48e (patch) | |
| tree | cdc0599c20b52a472254720890727a3d9fbde957 /drivers/video/intelfb/Makefile | |
| parent | 369aa8395a5dcc89230f1de5459124c4b0db9fca (diff) | |
| parent | 4dc3595f5c569021b1bd0109502acfca82036902 (diff) | |
Merge branch 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/intelfb-2.6
* 'intelfb-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/intelfb-2.6:
intelfbhw.c: intelfbhw_get_p1p2 defined but not used
intelfb: fix mtrr_reg signedness
intelfb: update doc and Kconfig (supported devices)
intelfb: add preliminary i2c support
intelfb: add preliminary i2c support
intelfb: add preliminary i2c support
intelfb: add preliminary i2c support
intelfb: add preliminary i2c support
intelfb: add preliminary i2c support
intelfb: add preliminary i2c support
intelfb: add preliminary i2c support
intelfb: add vsync interrupt support
intelfb: add vsync interrupt support
intelfb: add vsync interrupt support
intelfb: add vsync interrupt support
intelfb: add vsync interrupt support
Diffstat (limited to 'drivers/video/intelfb/Makefile')
| -rw-r--r-- | drivers/video/intelfb/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
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 @@ | |||
| 1 | obj-$(CONFIG_FB_INTEL) += intelfb.o | 1 | obj-$(CONFIG_FB_INTEL) += intelfb.o |
| 2 | 2 | ||
| 3 | intelfb-objs := intelfbdrv.o intelfbhw.o | 3 | intelfb-y := intelfbdrv.o intelfbhw.o |
| 4 | intelfb-$(CONFIG_FB_INTEL_I2C) += intelfb_i2c.o | ||
| 5 | intelfb-objs := $(intelfb-y) | ||
| 4 | 6 | ||
| 5 | ifdef CONFIG_FB_INTEL_DEBUG | 7 | ifdef CONFIG_FB_INTEL_DEBUG |
| 6 | #EXTRA_CFLAGS += -DDEBUG -DVERBOSE -DREGDUMP | 8 | #EXTRA_CFLAGS += -DDEBUG -DVERBOSE -DREGDUMP |