diff --git a/config/graphic b/config/graphic
index fc23d9ecbb..f5860da128 100644
--- a/config/graphic
+++ b/config/graphic
@@ -5,12 +5,9 @@ get_graphicdrivers() {
 
   for drv in $GRAPHIC_DRIVERS; do
     if [ "$drv" = "fglrx" ]; then
-      DRI_DRIVERS="$DRI_DRIVERS"
-      GALLIUM_DRIVERS="$GALLIUM_DRIVERS"
       XORG_DRIVERS="$XORG_DRIVERS fglrx"
       COMPOSITE_SUPPORT="yes"
       XINERAMA_SUPPORT="yes"
-#      LLVM_SUPPORT="yes"
     fi
 
     if [ "$drv" = "i915" ]; then
@@ -22,9 +19,7 @@ get_graphicdrivers() {
 
     if [ "$drv" = "i965" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,i965"
-#      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,i965"
       XORG_DRIVERS="$XORG_DRIVERS intel"
-#      LLVM_SUPPORT="yes"
     fi
 
     if [ "$drv" = "nouveau" ]; then
@@ -32,22 +27,11 @@ get_graphicdrivers() {
       GALLIUM_DRIVERS="$GALLIUM_DRIVERS,nouveau"
       XORG_DRIVERS="$XORG_DRIVERS nouveau"
 #      LLVM_SUPPORT="yes"
-      if [ "$VDPAU" = yes ]; then
-        MESA_VDPAU_SUPPORT=yes
-        GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swrast"
-      fi
-#      if [ "$VAAPI" = yes ]; then
-#        MESA_VAAPI_SUPPORT=yes
-#        GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swrast"
-#      fi
     fi
 
     if [ "$drv" = "nvidia" ]; then
-      DRI_DRIVERS="$DRI_DRIVERS"
-      GALLIUM_DRIVERS="$GALLIUM_DRIVERS"
       XORG_DRIVERS="$XORG_DRIVERS nvidia"
       XINERAMA_SUPPORT="yes"
-#      LLVM_SUPPORT="yes"
     fi
 
     if [ "$drv" = "omapfb" ]; then
@@ -59,39 +43,19 @@ get_graphicdrivers() {
 
     if [ "$drv" = "r200" ]; then
       DRI_DRIVERS="$DRI_DRIVERS,r200"
-#      GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r200"
       XORG_DRIVERS="$XORG_DRIVERS ati"
-#      LLVM_SUPPORT="yes"
     fi
 
     if [ "$drv" = "r300" ]; then
-#      DRI_DRIVERS="$DRI_DRIVERS,r300"
       GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r300"
       XORG_DRIVERS="$XORG_DRIVERS ati"
       LLVM_SUPPORT="yes"
-      if [ "$VDPAU" = yes ]; then
-        MESA_VDPAU_SUPPORT=yes
-        GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swrast"
-      fi
-#      if [ "$VAAPI" = yes ]; then
-#        MESA_VAAPI_SUPPORT=yes
-#        GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swrast"
-#      fi
     fi
 
     if [ "$drv" = "r600" ]; then
-#      DRI_DRIVERS="$DRI_DRIVERS,r600"
       GALLIUM_DRIVERS="$GALLIUM_DRIVERS,r600"
       XORG_DRIVERS="$XORG_DRIVERS ati"
       LLVM_SUPPORT="yes"
-      if [ "$VDPAU" = yes ]; then
-        MESA_VDPAU_SUPPORT=yes
-        GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swrast"
-      fi
-#      if [ "$VAAPI" = yes ]; then
-#        MESA_VAAPI_SUPPORT=yes
-#        GALLIUM_DRIVERS="$GALLIUM_DRIVERS,swrast"
-#      fi
     fi
 
     if [ "$drv" = "vmware" ]; then