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 drm/drm-next into drm-misc-next
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
Makefile
diff --git
a/arch/x86/Makefile
b/arch/x86/Makefile
index fdc2e3abd6152f53530f687a3f9041c020065609..95315d3474a292cc3418ea4a9f43dedcdbd5dc14 100644
(file)
--- a/
arch/x86/Makefile
+++ b/
arch/x86/Makefile
@@
-259,7
+259,7
@@
drivers-$(CONFIG_PCI) += arch/x86/pci/
# suspend and hibernation support
drivers-$(CONFIG_PM) += arch/x86/power/
-drivers-$(CONFIG_FB) += arch/x86/video/
+drivers-$(CONFIG_FB
_CORE
) += arch/x86/video/
####
# boot loader support. Several targets are kept for legacy purposes