git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'i915fb' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelf...
[sfrench/cifs-2.6.git]
/
drivers
/
video
/
Kconfig
diff --git
a/drivers/video/Kconfig
b/drivers/video/Kconfig
index 4587087d777ab6a69edb66fd4f661b5017b08404..5641498725d0c5ed739fd6da5d99f0d1fe6393cc 100644
(file)
--- a/
drivers/video/Kconfig
+++ b/
drivers/video/Kconfig
@@
-743,7
+743,7
@@
config FB_I810_I2C
config FB_INTEL
tristate "Intel 830M/845G/852GM/855GM/865G support (EXPERIMENTAL)"
- depends on FB && EXPERIMENTAL && PCI && X86
_32
+ depends on FB && EXPERIMENTAL && PCI && X86
select AGP
select AGP_INTEL
select FB_MODE_HELPERS