diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-10 13:25:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-10 13:25:42 +0100 |
| commit | f9915bfef3c64ea0b0b960dd1b999b584a7ef460 (patch) | |
| tree | ec8d1c35a542e4c8e08b5a2be380b2bdef9a10d0 /drivers/video/Kconfig | |
| parent | b91facc367366b3f71375f337eb5997ec9ab4e69 (diff) | |
| parent | acd895795d35d7c6405f20301a846d16998795ec (diff) | |
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
Diffstat (limited to 'drivers/video/Kconfig')
| -rw-r--r-- | drivers/video/Kconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index f0267706cb4..bf0af660df8 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -1054,9 +1054,10 @@ config FB_RIVA_BACKLIGHT config FB_I810 tristate "Intel 810/815 support (EXPERIMENTAL)" - depends on FB && EXPERIMENTAL && PCI && X86_32 + depends on EXPERIMENTAL && PCI && X86_32 select AGP select AGP_INTEL + select FB select FB_MODE_HELPERS select FB_CFB_FILLRECT select FB_CFB_COPYAREA @@ -1119,7 +1120,8 @@ config FB_CARILLO_RANCH config FB_INTEL tristate "Intel 830M/845G/852GM/855GM/865G/915G/945G/945GM/965G/965GM support (EXPERIMENTAL)" - depends on FB && EXPERIMENTAL && PCI && X86 + depends on EXPERIMENTAL && PCI && X86 + select FB select AGP select AGP_INTEL select FB_MODE_HELPERS |