/[linux-patches]/genpatches-2.6/trunk/2.6.14-pre/1361_sparc-kconfig-rework.patch
Gentoo

Diff of /genpatches-2.6/trunk/2.6.14-pre/1361_sparc-kconfig-rework.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 107 Revision 111
1diff -Naurp linux-2.6.13-rc3-git4/arch/sparc/Kconfig linux-2.6.13-rc3-git4-gentoo/arch/sparc/Kconfig 1diff -Naurp linux-2.6.13-rc3-git4/arch/sparc/Kconfig linux-2.6.13-rc3-git4-gentoo/arch/sparc/Kconfig
2--- linux-2.6.13-rc3-git4/arch/sparc/Kconfig 2005-07-18 18:00:39.812719222 -0700 2--- linux-2.6.13-rc3-git4/arch/sparc/Kconfig 2005-07-18 18:00:39.812719000 -0700
3+++ linux-2.6.13-rc3-git4-gentoo/arch/sparc/Kconfig 2005-07-18 18:11:59.003763201 -0700 3+++ linux-2.6.13-rc3-git4-gentoo/arch/sparc/Kconfig 2005-07-24 13:35:15.368325289 -0700
4@@ -5,15 +5,25 @@ 4@@ -5,15 +5,25 @@
5 5
6 mainmenu "Linux/SPARC Kernel Configuration" 6 mainmenu "Linux/SPARC Kernel Configuration"
7 7
8-config MMU 8-config MMU
439- 439-
440- This option will slow down process creation somewhat. 440- This option will slow down process creation somewhat.
441- 441-
442-endmenu 442-endmenu
443diff -Naurp linux-2.6.13-rc3-git4/arch/sparc64/Kconfig linux-2.6.13-rc3-git4-gentoo/arch/sparc64/Kconfig 443diff -Naurp linux-2.6.13-rc3-git4/arch/sparc64/Kconfig linux-2.6.13-rc3-git4-gentoo/arch/sparc64/Kconfig
444--- linux-2.6.13-rc3-git4/arch/sparc64/Kconfig 2005-07-18 18:00:39.839714586 -0700 444--- linux-2.6.13-rc3-git4/arch/sparc64/Kconfig 2005-07-18 18:00:39.839714000 -0700
445+++ linux-2.6.13-rc3-git4-gentoo/arch/sparc64/Kconfig 2005-07-18 18:44:30.687327634 -0700 445+++ linux-2.6.13-rc3-git4-gentoo/arch/sparc64/Kconfig 2005-07-24 13:35:15.447312335 -0700
446@@ -5,6 +5,17 @@ 446@@ -5,6 +5,17 @@
447 447
448 mainmenu "Linux/UltraSPARC Kernel Configuration" 448 mainmenu "Linux/UltraSPARC Kernel Configuration"
449 449
450+# Identify this as a Sparc64 build 450+# Identify this as a Sparc64 build
980- 980-
981 source "arch/sparc64/oprofile/Kconfig" 981 source "arch/sparc64/oprofile/Kconfig"
982 982
983 source "arch/sparc64/Kconfig.debug" 983 source "arch/sparc64/Kconfig.debug"
984diff -Naurp linux-2.6.13-rc3-git4/drivers/char/drm/Kconfig linux-2.6.13-rc3-git4-gentoo/drivers/char/drm/Kconfig 984diff -Naurp linux-2.6.13-rc3-git4/drivers/char/drm/Kconfig linux-2.6.13-rc3-git4-gentoo/drivers/char/drm/Kconfig
985--- linux-2.6.13-rc3-git4/drivers/char/drm/Kconfig 2005-07-18 18:11:44.574247185 -0700 985--- linux-2.6.13-rc3-git4/drivers/char/drm/Kconfig 2005-07-18 18:11:44.574247000 -0700
986+++ linux-2.6.13-rc3-git4-gentoo/drivers/char/drm/Kconfig 2005-07-18 18:11:59.014761308 -0700 986+++ linux-2.6.13-rc3-git4-gentoo/drivers/char/drm/Kconfig 2005-07-24 13:40:23.591743253 -0700
987@@ -6,15 +6,15 @@
988 #
989 config DRM
990 tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
991- depends on (AGP || AGP=n) && PCI
992+ depends on AGP || PCI || SBUS
993 help
994 Kernel-level support for the Direct Rendering Infrastructure (DRI)
995 introduced in XFree86 4.0. If you say Y here, you need to select
996 the module that's right for your graphics card from the list below.
997 These modules provide support for synchronization, security, and
998 DMA transfers. Please see <http://dri.sourceforge.net/> for more
999- details. You should also select and configure AGP
1000- (/dev/agpgart) support.
1001+ details. You should also select and configure AGP (/dev/agpgart)
1002+ support if your graphics card is connected to an AGP slot.
1003
1004 config DRM_TDFX
1005 tristate "3dfx Banshee/Voodoo3+"
987@@ -103,3 +103,11 @@ config DRM_VIA 1006@@ -103,3 +103,11 @@ config DRM_VIA
988 Choose this option if you have a Via unichrome or compatible video 1007 Choose this option if you have a Via unichrome or compatible video
989 chipset. If M is selected the module will be called via. 1008 chipset. If M is selected the module will be called via.
990 1009
991+config DRM_FFB 1010+config DRM_FFB
992+ tristate "Creator/Creator3D" 1011+ tristate "Creator/Creator3D"
993+ depends on DRM && SPARC64 1012+ depends on DRM && SBUS && SPARC64 && BROKEN
994+ help 1013+ help
995+ Choose this option if you have one of Sun's Creator3D-based graphics 1014+ Choose this option if you have one of Sun's Creator3D-based graphics
996+ and frame buffer cards. Product page at 1015+ and frame buffer cards. Product page at
997+ <http://www.sun.com/desktop/products/Graphics/creator3d.html>. 1016+ <http://www.sun.com/desktop/products/Graphics/creator3d.html>.
998+ 1017+
999diff -Naurp linux-2.6.13-rc3-git4/drivers/char/Kconfig linux-2.6.13-rc3-git4-gentoo/drivers/char/Kconfig 1018diff -Naurp linux-2.6.13-rc3-git4/drivers/char/Kconfig linux-2.6.13-rc3-git4-gentoo/drivers/char/Kconfig
1000--- linux-2.6.13-rc3-git4/drivers/char/Kconfig 2005-07-18 18:11:44.575247013 -0700 1019--- linux-2.6.13-rc3-git4/drivers/char/Kconfig 2005-07-18 18:11:44.575247000 -0700
1001+++ linux-2.6.13-rc3-git4-gentoo/drivers/char/Kconfig 2005-07-18 18:11:59.013761480 -0700 1020+++ linux-2.6.13-rc3-git4-gentoo/drivers/char/Kconfig 2005-07-24 13:35:15.608285936 -0700
1002@@ -345,6 +345,13 @@ config AU1000_SERIAL_CONSOLE 1021@@ -345,6 +345,13 @@ config AU1000_SERIAL_CONSOLE
1003 If you have an Alchemy AU1000 processor (MIPS based) and you want 1022 If you have an Alchemy AU1000 processor (MIPS based) and you want
1004 to use a console on a serial port, say Y. Otherwise, say N. 1023 to use a console on a serial port, say Y. Otherwise, say N.
1005 1024
1006+config SUN_AURORA 1025+config SUN_AURORA
1065+ 1084+
1066 1085
1067 menu "Ftape, the floppy tape device driver" 1086 menu "Ftape, the floppy tape device driver"
1068 1087
1069diff -Naurp linux-2.6.13-rc3-git4/drivers/Kconfig linux-2.6.13-rc3-git4-gentoo/drivers/Kconfig 1088diff -Naurp linux-2.6.13-rc3-git4/drivers/Kconfig linux-2.6.13-rc3-git4-gentoo/drivers/Kconfig
1070--- linux-2.6.13-rc3-git4/drivers/Kconfig 2005-07-18 18:00:40.075674063 -0700 1089--- linux-2.6.13-rc3-git4/drivers/Kconfig 2005-07-18 18:00:40.075674000 -0700
1071+++ linux-2.6.13-rc3-git4-gentoo/drivers/Kconfig 2005-07-18 18:49:36.231650387 -0700 1090+++ linux-2.6.13-rc3-git4-gentoo/drivers/Kconfig 2005-07-24 13:35:15.640280688 -0700
1072@@ -62,4 +62,9 @@ source "drivers/infiniband/Kconfig" 1091@@ -62,4 +62,9 @@ source "drivers/infiniband/Kconfig"
1073 1092
1074 source "drivers/sn/Kconfig" 1093 source "drivers/sn/Kconfig"
1075 1094
1076+if SPARC32 || SPARC64 1095+if SPARC32 || SPARC64
1079+endif 1098+endif
1080+ 1099+
1081 endmenu 1100 endmenu
1082diff -Naurp linux-2.6.13-rc3-git4/drivers/sbus/char/Kconfig linux-2.6.13-rc3-git4-gentoo/drivers/sbus/char/Kconfig 1101diff -Naurp linux-2.6.13-rc3-git4/drivers/sbus/char/Kconfig linux-2.6.13-rc3-git4-gentoo/drivers/sbus/char/Kconfig
1083--- linux-2.6.13-rc3-git4/drivers/sbus/char/Kconfig 2005-06-17 12:48:29.000000000 -0700 1102--- linux-2.6.13-rc3-git4/drivers/sbus/char/Kconfig 2005-06-17 12:48:29.000000000 -0700
1084+++ linux-2.6.13-rc3-git4-gentoo/drivers/sbus/char/Kconfig 2005-07-18 18:11:59.016760964 -0700 1103+++ linux-2.6.13-rc3-git4-gentoo/drivers/sbus/char/Kconfig 2005-07-24 13:35:15.709269374 -0700
1085@@ -13,15 +13,6 @@ config SUN_OPENPROMIO 1104@@ -13,15 +13,6 @@ config SUN_OPENPROMIO
1086 1105
1087 If unsure, say Y. 1106 If unsure, say Y.
1088 1107
1089-config SUN_MOSTEK_RTC 1108-config SUN_MOSTEK_RTC
1134 1153
1135 endmenu 1154 endmenu
1136 1155
1137diff -Naurp linux-2.6.13-rc3-git4/drivers/sbus/Makefile linux-2.6.13-rc3-git4-gentoo/drivers/sbus/Makefile 1156diff -Naurp linux-2.6.13-rc3-git4/drivers/sbus/Makefile linux-2.6.13-rc3-git4-gentoo/drivers/sbus/Makefile
1138--- linux-2.6.13-rc3-git4/drivers/sbus/Makefile 2005-06-17 12:48:29.000000000 -0700 1157--- linux-2.6.13-rc3-git4/drivers/sbus/Makefile 2005-06-17 12:48:29.000000000 -0700
1139+++ linux-2.6.13-rc3-git4-gentoo/drivers/sbus/Makefile 2005-07-18 18:11:59.016760964 -0700 1158+++ linux-2.6.13-rc3-git4-gentoo/drivers/sbus/Makefile 2005-07-24 13:35:15.808253141 -0700
1140@@ -6,4 +6,4 @@ ifneq ($(ARCH),m68k) 1159@@ -6,4 +6,4 @@ ifneq ($(ARCH),m68k)
1141 obj-y := sbus.o dvma.o 1160 obj-y := sbus.o dvma.o
1142 endif 1161 endif
1143 1162
1144-obj-$(CONFIG_SBUSCHAR) += char/ 1163-obj-$(CONFIG_SBUSCHAR) += char/
1145+obj-y += char/ 1164+obj-y += char/
1146diff -Naurp linux-2.6.13-rc3-git4/fs/Kconfig linux-2.6.13-rc3-git4-gentoo/fs/Kconfig 1165diff -Naurp linux-2.6.13-rc3-git4/fs/Kconfig linux-2.6.13-rc3-git4-gentoo/fs/Kconfig
1147--- linux-2.6.13-rc3-git4/fs/Kconfig 2005-07-18 18:00:42.781209426 -0700 1166--- linux-2.6.13-rc3-git4/fs/Kconfig 2005-07-18 18:00:42.781209000 -0700
1148+++ linux-2.6.13-rc3-git4-gentoo/fs/Kconfig 2005-07-18 18:11:59.018760619 -0700 1167+++ linux-2.6.13-rc3-git4-gentoo/fs/Kconfig 2005-07-24 13:35:15.883240843 -0700
1149@@ -856,6 +856,20 @@ config RAMFS 1168@@ -856,6 +856,20 @@ config RAMFS
1150 To compile this as a module, choose M here: the module will be called 1169 To compile this as a module, choose M here: the module will be called
1151 ramfs. 1170 ramfs.
1152 1171
1153+config SUN_OPENPROMFS 1172+config SUN_OPENPROMFS

Legend:
Removed from v.107  
changed lines
  Added in v.111

  ViewVC Help
Powered by ViewVC 1.1.20