diff options
author | James Simmons <jsimmons@infradead.org> | 2007-03-06 04:42:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 12:30:24 -0500 |
commit | 166f60dde0f3793e67bd0d76952eaa46705bbaa9 (patch) | |
tree | 603c9bb0c84a3f9bfa3f919c6500fb88b2af916f | |
parent | df470c30da7900a3fbc48e3d34187a3786c1acdb (diff) |
[PATCH] fbdev: fix kconfig error if FB_DDC=n
Fix the following error if FB_DDC=n
Kernel: arch/x86_64/boot/bzImage is ready (#1)
Building modules, stage 2.
MODPOST 229 modules
WARNING: "fb_ddc_read" [drivers/video/nvidia/nvidiafb.ko] undefined!
make[1]: *** [__modpost] Error 1
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Cc: James Simmons <jsimmons@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/video/Kconfig | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index b8f0a11e8f31..7f5a59836818 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
@@ -677,8 +677,6 @@ config FB_S1D13XXX | |||
677 | config FB_NVIDIA | 677 | config FB_NVIDIA |
678 | tristate "nVidia Framebuffer Support" | 678 | tristate "nVidia Framebuffer Support" |
679 | depends on FB && PCI | 679 | depends on FB && PCI |
680 | select I2C_ALGOBIT if FB_NVIDIA_I2C | ||
681 | select I2C if FB_NVIDIA_I2C | ||
682 | select FB_BACKLIGHT if FB_NVIDIA_BACKLIGHT | 680 | select FB_BACKLIGHT if FB_NVIDIA_BACKLIGHT |
683 | select FB_MODE_HELPERS | 681 | select FB_MODE_HELPERS |
684 | select FB_CFB_FILLRECT | 682 | select FB_CFB_FILLRECT |
@@ -697,6 +695,7 @@ config FB_NVIDIA | |||
697 | config FB_NVIDIA_I2C | 695 | config FB_NVIDIA_I2C |
698 | bool "Enable DDC Support" | 696 | bool "Enable DDC Support" |
699 | depends on FB_NVIDIA | 697 | depends on FB_NVIDIA |
698 | select FB_DDC | ||
700 | help | 699 | help |
701 | This enables I2C support for nVidia Chipsets. This is used | 700 | This enables I2C support for nVidia Chipsets. This is used |
702 | only for getting EDID information from the attached display | 701 | only for getting EDID information from the attached display |
@@ -716,7 +715,6 @@ config FB_NVIDIA_BACKLIGHT | |||
716 | config FB_RIVA | 715 | config FB_RIVA |
717 | tristate "nVidia Riva support" | 716 | tristate "nVidia Riva support" |
718 | depends on FB && PCI | 717 | depends on FB && PCI |
719 | select FB_DDC if FB_RIVA_I2C | ||
720 | select FB_BACKLIGHT if FB_RIVA_BACKLIGHT | 718 | select FB_BACKLIGHT if FB_RIVA_BACKLIGHT |
721 | select FB_MODE_HELPERS | 719 | select FB_MODE_HELPERS |
722 | select FB_CFB_FILLRECT | 720 | select FB_CFB_FILLRECT |
@@ -734,6 +732,7 @@ config FB_RIVA | |||
734 | config FB_RIVA_I2C | 732 | config FB_RIVA_I2C |
735 | bool "Enable DDC Support" | 733 | bool "Enable DDC Support" |
736 | depends on FB_RIVA | 734 | depends on FB_RIVA |
735 | select FB_DDC | ||
737 | help | 736 | help |
738 | This enables I2C support for nVidia Chipsets. This is used | 737 | This enables I2C support for nVidia Chipsets. This is used |
739 | only for getting EDID information from the attached display | 738 | only for getting EDID information from the attached display |
@@ -812,8 +811,6 @@ config FB_INTEL | |||
812 | depends on FB && EXPERIMENTAL && PCI && X86 | 811 | depends on FB && EXPERIMENTAL && PCI && X86 |
813 | select AGP | 812 | select AGP |
814 | select AGP_INTEL | 813 | select AGP_INTEL |
815 | select I2C_ALGOBIT if FB_INTEL_I2C | ||
816 | select I2C if FB_INTEL_I2C | ||
817 | select FB_MODE_HELPERS | 814 | select FB_MODE_HELPERS |
818 | select FB_CFB_FILLRECT | 815 | select FB_CFB_FILLRECT |
819 | select FB_CFB_COPYAREA | 816 | select FB_CFB_COPYAREA |
@@ -846,6 +843,7 @@ config FB_INTEL_DEBUG | |||
846 | config FB_INTEL_I2C | 843 | config FB_INTEL_I2C |
847 | bool "DDC/I2C for Intel framebuffer support" | 844 | bool "DDC/I2C for Intel framebuffer support" |
848 | depends on FB_INTEL | 845 | depends on FB_INTEL |
846 | select FB_DDC | ||
849 | default y | 847 | default y |
850 | help | 848 | help |
851 | Say Y here if you want DDC/I2C support for your on-board Intel graphics. | 849 | Say Y here if you want DDC/I2C support for your on-board Intel graphics. |
@@ -924,8 +922,8 @@ config FB_MATROX_G | |||
924 | 922 | ||
925 | config FB_MATROX_I2C | 923 | config FB_MATROX_I2C |
926 | tristate "Matrox I2C support" | 924 | tristate "Matrox I2C support" |
927 | depends on FB_MATROX && I2C | 925 | depends on FB_MATROX |
928 | select I2C_ALGOBIT | 926 | select FB_DDC |
929 | ---help--- | 927 | ---help--- |
930 | This drivers creates I2C buses which are needed for accessing the | 928 | This drivers creates I2C buses which are needed for accessing the |
931 | DDC (I2C) bus present on all Matroxes, an I2C bus which | 929 | DDC (I2C) bus present on all Matroxes, an I2C bus which |
@@ -993,7 +991,6 @@ config FB_MATROX_MULTIHEAD | |||
993 | config FB_RADEON | 991 | config FB_RADEON |
994 | tristate "ATI Radeon display support" | 992 | tristate "ATI Radeon display support" |
995 | depends on FB && PCI | 993 | depends on FB && PCI |
996 | select FB_DDC if FB_RADEON_I2C | ||
997 | select FB_BACKLIGHT if FB_RADEON_BACKLIGHT | 994 | select FB_BACKLIGHT if FB_RADEON_BACKLIGHT |
998 | select FB_MODE_HELPERS | 995 | select FB_MODE_HELPERS |
999 | select FB_CFB_FILLRECT | 996 | select FB_CFB_FILLRECT |
@@ -1018,6 +1015,7 @@ config FB_RADEON | |||
1018 | config FB_RADEON_I2C | 1015 | config FB_RADEON_I2C |
1019 | bool "DDC/I2C for ATI Radeon support" | 1016 | bool "DDC/I2C for ATI Radeon support" |
1020 | depends on FB_RADEON | 1017 | depends on FB_RADEON |
1018 | select FB_DDC | ||
1021 | default y | 1019 | default y |
1022 | help | 1020 | help |
1023 | Say Y here if you want DDC/I2C support for your Radeon board. | 1021 | Say Y here if you want DDC/I2C support for your Radeon board. |
@@ -1125,7 +1123,6 @@ config FB_S3 | |||
1125 | config FB_SAVAGE | 1123 | config FB_SAVAGE |
1126 | tristate "S3 Savage support" | 1124 | tristate "S3 Savage support" |
1127 | depends on FB && PCI && EXPERIMENTAL | 1125 | depends on FB && PCI && EXPERIMENTAL |
1128 | select FB_DDC if FB_SAVAGE_I2C | ||
1129 | select FB_MODE_HELPERS | 1126 | select FB_MODE_HELPERS |
1130 | select FB_CFB_FILLRECT | 1127 | select FB_CFB_FILLRECT |
1131 | select FB_CFB_COPYAREA | 1128 | select FB_CFB_COPYAREA |
@@ -1142,6 +1139,7 @@ config FB_SAVAGE | |||
1142 | config FB_SAVAGE_I2C | 1139 | config FB_SAVAGE_I2C |
1143 | bool "Enable DDC2 Support" | 1140 | bool "Enable DDC2 Support" |
1144 | depends on FB_SAVAGE | 1141 | depends on FB_SAVAGE |
1142 | select FB_DDC | ||
1145 | help | 1143 | help |
1146 | This enables I2C support for S3 Savage Chipsets. This is used | 1144 | This enables I2C support for S3 Savage Chipsets. This is used |
1147 | only for getting EDID information from the attached display | 1145 | only for getting EDID information from the attached display |