diff --git a/ppc/G4 b/ppc/G4
index e7b7c13..e3dda00 100644
--- a/ppc/G4
+++ b/ppc/G4
@@ -770,8 +770,7 @@ CONFIG_FB_ASILIANT=y
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_S3TRIO is not set
 # CONFIG_FB_VGA16 is not set
-CONFIG_FB_RIVA=y
-CONFIG_FB_RIVA_I2C=y
+# CONFIG_FB_RIVA is not set
 CONFIG_FB_MATROX=y
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -784,11 +783,7 @@ CONFIG_FB_RADEON=y
 CONFIG_FB_RADEON_I2C=y
 # CONFIG_FB_RADEON_DEBUG is not set
 CONFIG_FB_ATY128=y
-CONFIG_FB_ATY=y
-CONFIG_FB_ATY_CT=y
-# CONFIG_FB_ATY_GENERIC_LCD is not set
-# CONFIG_FB_ATY_XL_INIT is not set
-CONFIG_FB_ATY_GX=y
+# CONFIG_FB_ATY is not set
 # CONFIG_FB_SIS is not set
 # CONFIG_FB_NEOMAGIC is not set
 # CONFIG_FB_KYRO is not set
diff --git a/ppc/G4-SMP b/ppc/G4-SMP
index 9e38da2..28ef715 100644
--- a/ppc/G4-SMP
+++ b/ppc/G4-SMP
@@ -771,8 +771,8 @@ CONFIG_FB_ASILIANT=y
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_S3TRIO is not set
 # CONFIG_FB_VGA16 is not set
-CONFIG_FB_RIVA=y
-CONFIG_FB_RIVA_I2C=y
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_RIVA_I2C is not set
 CONFIG_FB_MATROX=y
 CONFIG_FB_MATROX_MILLENIUM=y
 CONFIG_FB_MATROX_MYSTIQUE=y
@@ -785,11 +785,11 @@ CONFIG_FB_RADEON=y
 CONFIG_FB_RADEON_I2C=y
 # CONFIG_FB_RADEON_DEBUG is not set
 CONFIG_FB_ATY128=y
-CONFIG_FB_ATY=y
-CONFIG_FB_ATY_CT=y
+# CONFIG_FB_ATY=y
+# CONFIG_FB_ATY_CT=y
 # CONFIG_FB_ATY_GENERIC_LCD is not set
 # CONFIG_FB_ATY_XL_INIT is not set
-CONFIG_FB_ATY_GX=y
+# CONFIG_FB_ATY_GX is not set
 # CONFIG_FB_SIS is not set
 # CONFIG_FB_NEOMAGIC is not set
 # CONFIG_FB_KYRO is not set
diff --git a/ppc/G5 b/ppc/G5
index 09e706c..7593c28 100644
--- a/ppc/G5
+++ b/ppc/G5
@@ -721,7 +721,7 @@ CONFIG_FB_ASILIANT=y
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_S3TRIO is not set
 # CONFIG_FB_VGA16 is not set
-CONFIG_FB_RIVA=y
+# CONFIG_FB_RIVA=y
 # CONFIG_FB_RIVA_I2C is not set
 CONFIG_FB_MATROX=y
 CONFIG_FB_MATROX_MILLENIUM=y
@@ -735,11 +735,11 @@ CONFIG_FB_RADEON=y
 CONFIG_FB_RADEON_I2C=y
 # CONFIG_FB_RADEON_DEBUG is not set
 CONFIG_FB_ATY128=y
-CONFIG_FB_ATY=y
-CONFIG_FB_ATY_CT=y
+# CONFIG_FB_ATY=y
+# CONFIG_FB_ATY_CT=y
 # CONFIG_FB_ATY_GENERIC_LCD is not set
 # CONFIG_FB_ATY_XL_INIT is not set
-CONFIG_FB_ATY_GX=y
+# CONFIG_FB_ATY_GX=y
 # CONFIG_FB_SIS is not set
 # CONFIG_FB_NEOMAGIC is not set
 # CONFIG_FB_KYRO is not set
diff --git a/ppc/G5-SMP b/ppc/G5-SMP
index 753c39f..bec966d 100644
--- a/ppc/G5-SMP
+++ b/ppc/G5-SMP
@@ -722,7 +722,7 @@ CONFIG_FB_ASILIANT=y
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_S3TRIO is not set
 # CONFIG_FB_VGA16 is not set
-CONFIG_FB_RIVA=y
+# CONFIG_FB_RIVA=y
 # CONFIG_FB_RIVA_I2C is not set
 CONFIG_FB_MATROX=y
 CONFIG_FB_MATROX_MILLENIUM=y
@@ -736,11 +736,11 @@ CONFIG_FB_RADEON=y
 CONFIG_FB_RADEON_I2C=y
 # CONFIG_FB_RADEON_DEBUG is not set
 CONFIG_FB_ATY128=y
-CONFIG_FB_ATY=y
-CONFIG_FB_ATY_CT=y
+# CONFIG_FB_ATY=y
+# CONFIG_FB_ATY_CT=y
 # CONFIG_FB_ATY_GENERIC_LCD is not set
 # CONFIG_FB_ATY_XL_INIT is not set
-CONFIG_FB_ATY_GX=y
+# CONFIG_FB_ATY_GX=y
 # CONFIG_FB_SIS is not set
 # CONFIG_FB_NEOMAGIC is not set
 # CONFIG_FB_KYRO is not set