From: Randy Dunlap <[email protected]>
Put AGP and DRM (DRI) under the Graphics config menu.
Rearrange 2 of the backlight entries so that they are not orphaned.
Tested with menuconfig, xconfig, & gconfig.
Signed-off-by: Randy Dunlap <[email protected]>
---
drivers/char/Kconfig | 4 ----
drivers/char/agp/Kconfig | 3 +++
drivers/char/drm/Kconfig | 3 +++
drivers/video/Kconfig | 9 +++++++++
drivers/video/backlight/Kconfig | 33 ++++++++++++++++-----------------
5 files changed, 31 insertions(+), 21 deletions(-)
--- linux-2616-rc4.orig/drivers/char/Kconfig
+++ linux-2616-rc4/drivers/char/Kconfig
@@ -885,10 +885,6 @@ source "drivers/char/ftape/Kconfig"
endmenu
-source "drivers/char/agp/Kconfig"
-
-source "drivers/char/drm/Kconfig"
-
source "drivers/char/pcmcia/Kconfig"
config MWAVE
--- linux-2616-rc4.orig/drivers/video/Kconfig
+++ linux-2616-rc4/drivers/video/Kconfig
@@ -4,6 +4,12 @@
menu "Graphics support"
+source "drivers/char/agp/Kconfig"
+
+source "drivers/char/drm/Kconfig"
+
+menu "Frame buffer driver support"
+
config FB
tristate "Support for frame buffer devices"
---help---
@@ -1446,6 +1452,9 @@ config FB_VIRTUAL
module will be called vfb.
If unsure, say N.
+
+endmenu
+
if VT
source "drivers/video/console/Kconfig"
endif
--- linux-2616-rc4.orig/drivers/char/agp/Kconfig
+++ linux-2616-rc4/drivers/char/agp/Kconfig
@@ -1,3 +1,5 @@
+menu "AGP driver support"
+
config AGP
tristate "/dev/agpgart (AGP Support)" if !GART_IOMMU
depends on ALPHA || IA64 || PPC || X86
@@ -169,3 +171,4 @@ config AGP_SGI_TIOCA
This option gives you AGP GART support for the SGI TIO chipset
for IA64 processors.
+endmenu
--- linux-2616-rc4.orig/drivers/char/drm/Kconfig
+++ linux-2616-rc4/drivers/char/drm/Kconfig
@@ -5,6 +5,8 @@
# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
#
+menu "Direct Rendering Infrastructure (DRI) support"
+
config DRM
tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
depends on (AGP || AGP=n) && PCI
@@ -104,3 +106,4 @@ config DRM_SAVAGE
Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister
chipset. If M is selected the module will be called savage.
+endmenu
--- linux-2616-rc4.orig/drivers/video/backlight/Kconfig
+++ linux-2616-rc4/drivers/video/backlight/Kconfig
@@ -24,6 +24,22 @@ config BACKLIGHT_DEVICE
depends on BACKLIGHT_CLASS_DEVICE
default y
+config BACKLIGHT_CORGI
+ tristate "Sharp Corgi Backlight Driver (SL-C7xx Series)"
+ depends on BACKLIGHT_DEVICE && PXA_SHARPSL
+ default y
+ help
+ If you have a Sharp Zaurus SL-C7xx, say y to enable the
+ backlight driver.
+
+config BACKLIGHT_HP680
+ tristate "HP Jornada 680 Backlight Driver"
+ depends on BACKLIGHT_DEVICE && SH_HP6XX
+ default y
+ help
+ If you have a HP Jornada 680, say y to enable the
+ backlight driver.
+
config LCD_CLASS_DEVICE
tristate "Lowlevel LCD controls"
depends on BACKLIGHT_LCD_SUPPORT
@@ -41,20 +57,3 @@ config LCD_DEVICE
bool
depends on LCD_CLASS_DEVICE
default y
-
-config BACKLIGHT_CORGI
- tristate "Sharp Corgi Backlight Driver (SL-C7xx Series)"
- depends on BACKLIGHT_DEVICE && PXA_SHARPSL
- default y
- help
- If you have a Sharp Zaurus SL-C7xx, say y to enable the
- backlight driver.
-
-config BACKLIGHT_HP680
- tristate "HP Jornada 680 Backlight Driver"
- depends on BACKLIGHT_DEVICE && SH_HP6XX
- default y
- help
- If you have a HP Jornada 680, say y to enable the
- backlight driver.
-
---
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
