Update of /cvsroot/linuxconsole/ruby/linux/drivers/video
In directory usw-pr-cvs1:/tmp/cvs-serv8882/drivers/video
Modified Files:
Config.in Makefile
Log Message:
Synced to ARM tree now that it is not against AC tree.
Index: Config.in
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/Config.in,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- Config.in 2001/11/22 12:56:48 1.54
+++ Config.in 2001/11/23 04:10:15 1.55
@@ -33,19 +33,23 @@
fi
fi
fi
- dep_tristate ' Cyber2000 support' CONFIG_FB_CYBER2000 $CONFIG_PCI
if [ "$CONFIG_ARM" = "y" ]; then
- dep_bool ' Acorn VIDC support' CONFIG_FB_ACORN $CONFIG_ARCH_ACORN
- dep_bool ' Anakin LCD support' CONFIG_FB_ANAKIN $CONFIG_ARCH_ANAKIN
- dep_bool ' SA-1100 LCD support' CONFIG_FB_SA1100 $CONFIG_ARCH_SA1100
- dep_bool ' Anakin LCD support' CONFIG_FB_ANAKIN $CONFIG_ARCH_ANAKIN
- if [ "$CONFIG_FB_SA1100" = "y" -a "$CONFIG_SA1100_CERF" = "y" ]; then
- choice 'CerfBoard LCD Display Size' \
- "3.8 CONFIG_CERF_LCD_38_A \
- 5.7 CONFIG_CERF_LCD_57_A \
- 7.2 CONFIG_CERF_LCD_72_A" 5.7
- fi
- fi
+ dep_bool ' Acorn VIDC support' CONFIG_FB_ACORN $CONFIG_ARCH_ACORN
+ dep_bool ' Anakin LCD support' CONFIG_FB_ANAKIN $CONFIG_ARCH_ANAKIN
+ dep_bool ' CLPS711X LCD support' CONFIG_FB_CLPS711X $CONFIG_ARCH_CLPS711X
+ dep_bool ' SA-1100 LCD support' CONFIG_FB_SA1100 $CONFIG_ARCH_SA1100
+ if [ "$CONFIG_FB_SA1100" = "y" -a "$CONFIG_SA1100_CERF" = "y" ]; then
+ choice 'CerfBoard LCD Display Size' \
+ "3.8_Color CONFIG_CERF_LCD_38_A \
+ 3.8_Mono CONFIG_CERF_LCD_38_B \
+ 5.7 CONFIG_CERF_LCD_57_A \
+ 7.2 CONFIG_CERF_LCD_72_A" 5.7
+ fi
+ if [ "$CONFIG_FB_SA1100" = "y" -a "$CONFIG_SA1100_CERF_CPLD" = "y" ]; then
+ bool 'Cerfboard Backlight (CerfPDA)' CONFIG_SA1100_CERF_LCD_BACKLIGHT
+ fi
+ fi
+ dep_tristate ' CyberPro 2000/2010/5000 support' CONFIG_FB_CYBER2000 $CONFIG_PCI
if [ "$CONFIG_APOLLO" = "y" ]; then
define_bool CONFIG_FB_APOLLO y
fi
Index: Makefile
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/drivers/video/Makefile,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- Makefile 2001/11/22 13:09:04 1.43
+++ Makefile 2001/11/23 04:10:15 1.44
@@ -1,5 +1,5 @@
# Makefile for the Linux video drivers.
-# 5 Aug 1999, James Simmons, <mailto:jsi...@ed...>
+# 5 Aug 1999, James Simmons, <mailto:jsi...@tr...>
# Rewritten to use lists instead of if-statements.
O_TARGET := video.o
|
