patch-2.1.109 linux/drivers/sbus/char/Config.in

Next file: linux/drivers/sbus/char/Makefile
Previous file: linux/drivers/pci/oldproc.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.108/linux/drivers/sbus/char/Config.in linux/drivers/sbus/char/Config.in
@@ -1,42 +1,45 @@
 comment 'SBUS Frame Buffer support'
-bool 'Sun FB drivers appear in PROCFS' SUN_FBS_IN_PROCFS
-bool 'Load All Supported Drivers' CONFIG_SUN_FB_DISPLAY
 
-if [ "$CONFIG_SUN_FB_DISPLAY" = "n" ]; then
-	bool 'cgsix support' SUN_FB_CGSIX
-	bool 'tcx support' SUN_FB_TCX
-	bool 'cgthree support' SUN_FB_CGTHREE
-	bool 'cgfourteen support' SUN_FB_CGFOURTEEN
-	bool 'bwtwo support' SUN_FB_BWTWO
-	bool 'leo/zx support' SUN_FB_LEO
-	bool 'weitek P9X00 support' TADPOLE_FB_WEITEK
-	bool 'creator support' SUN_FB_CREATOR
-	if [ "$TADPOLE_FB_WEITEK" = "n" ]; then
-		fbs=$SUN_FB_CGSIX
-		fbs=$fbs$SUN_FB_TCX
-		fbs=$fbs$SUN_FB_CGTHREE
-		fbs=$fbs$SUN_FB_BWTWO
-		fbs=$fbs$SUN_FB_CGFOURTEEN
-		fbs=$fbs$SUN_FB_LEO
-		fbs=$fbs$TADPOLE_FB_WEITEK
-		fbs=$fbs$SUN_FB_CREATOR
-		if [ "$fbs" = "nnnnnnnn" ]; then
-			echo "Warning: You have excluded ALL FB Support"
-			echo "Notice:  Enabling Generic AutoResolution"
+if [ "$CONFIG_FB" != "y" ]; then
+	bool 'Sun FB drivers appear in PROCFS' SUN_FBS_IN_PROCFS
+	bool 'Load All Supported Drivers' CONFIG_SUN_FB_DISPLAY
+
+	if [ "$CONFIG_SUN_FB_DISPLAY" = "n" ]; then
+		bool 'cgsix support' SUN_FB_CGSIX
+		bool 'tcx support' SUN_FB_TCX
+		bool 'cgthree support' SUN_FB_CGTHREE
+		bool 'cgfourteen support' SUN_FB_CGFOURTEEN
+		bool 'bwtwo support' SUN_FB_BWTWO
+		bool 'leo/zx support' SUN_FB_LEO
+		bool 'weitek P9X00 support' TADPOLE_FB_WEITEK
+		bool 'creator support' SUN_FB_CREATOR
+		if [ "$TADPOLE_FB_WEITEK" = "n" ]; then
+			fbs=$SUN_FB_CGSIX
+			fbs=$fbs$SUN_FB_TCX
+			fbs=$fbs$SUN_FB_CGTHREE
+			fbs=$fbs$SUN_FB_BWTWO
+			fbs=$fbs$SUN_FB_CGFOURTEEN
+			fbs=$fbs$SUN_FB_LEO
+			fbs=$fbs$TADPOLE_FB_WEITEK
+			fbs=$fbs$SUN_FB_CREATOR
+			if [ "$fbs" = "nnnnnnnn" ]; then
+				echo "Warning: You have excluded ALL FB Support"
+				echo "Notice:  Enabling Generic AutoResolution"
+				define_bool SUN_FB_GENERIC y
+			fi
+		else
 			define_bool SUN_FB_GENERIC y
 		fi
 	else
-		define_bool SUN_FB_GENERIC y
+		define_bool SUN_FB_CGSIX y
+		define_bool SUN_FB_TCX y
+		define_bool SUN_FB_CGTHREE y
+		define_bool SUN_FB_CGFOURTEEN y
+		define_bool SUN_FB_BWTWO y
+		define_bool SUN_FB_LEO y
+		define_bool TADPOLE_FB_WEITEK y
+		define_bool SUN_FB_CREATOR y
 	fi
-else
-	define_bool SUN_FB_CGSIX y
-	define_bool SUN_FB_TCX y
-	define_bool SUN_FB_CGTHREE y
-	define_bool SUN_FB_CGFOURTEEN y
-	define_bool SUN_FB_BWTWO y
-	define_bool SUN_FB_LEO y
-	define_bool TADPOLE_FB_WEITEK y
-	define_bool SUN_FB_CREATOR y
 fi
 
 comment 'Misc Linux/SPARC drivers'

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov