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

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

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

Revision 151 Revision 152
1diff -Naurp linux-2.6.13-rc4-git2/arch/sparc/Kconfig linux-2.6.13-rc4-git2-gentoo/arch/sparc/Kconfig 1diff -urNpX dontdiff linux-2.6.13-rc7/arch/sparc/Kconfig linux-dsd/arch/sparc/Kconfig
2--- linux-2.6.13-rc4-git2/arch/sparc/Kconfig 2005-07-30 19:45:56.026773134 -0700 2--- linux-2.6.13-rc7/arch/sparc/Kconfig 2005-08-24 09:53:21.000000000 +0100
3+++ linux-2.6.13-rc4-git2-gentoo/arch/sparc/Kconfig 2005-07-30 19:54:22.326031025 -0700 3+++ linux-dsd/arch/sparc/Kconfig 2005-08-29 13:59:53.000000000 +0100
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
415-endmenu 415-endmenu
416- 416-
417 source "fs/Kconfig" 417 source "fs/Kconfig"
418 418
419 source "arch/sparc/Kconfig.debug" 419 source "arch/sparc/Kconfig.debug"
420diff -Naurp linux-2.6.13-rc4-git2/arch/sparc64/Kconfig linux-2.6.13-rc4-git2-gentoo/arch/sparc64/Kconfig 420diff -urNpX dontdiff linux-2.6.13-rc7/arch/sparc64/Kconfig linux-dsd/arch/sparc64/Kconfig
421--- linux-2.6.13-rc4-git2/arch/sparc64/Kconfig 2005-07-30 19:45:56.029772637 -0700 421--- linux-2.6.13-rc7/arch/sparc64/Kconfig 2005-08-24 09:53:21.000000000 +0100
422+++ linux-2.6.13-rc4-git2-gentoo/arch/sparc64/Kconfig 2005-07-30 19:54:22.349027257 -0700 422+++ linux-dsd/arch/sparc64/Kconfig 2005-08-29 13:59:53.000000000 +0100
423@@ -5,6 +5,17 @@ 423@@ -5,6 +5,17 @@
424 424
425 mainmenu "Linux/UltraSPARC Kernel Configuration" 425 mainmenu "Linux/UltraSPARC Kernel Configuration"
426 426
427+# Identify this as a Sparc64 build 427+# Identify this as a Sparc64 build
956-source "drivers/char/watchdog/Kconfig" 956-source "drivers/char/watchdog/Kconfig"
957- 957-
958 source "arch/sparc64/oprofile/Kconfig" 958 source "arch/sparc64/oprofile/Kconfig"
959 959
960 source "arch/sparc64/Kconfig.debug" 960 source "arch/sparc64/Kconfig.debug"
961diff -Naurp linux-2.6.13-rc4-git2/drivers/char/drm/Kconfig linux-2.6.13-rc4-git2-gentoo/drivers/char/drm/Kconfig 961diff -urNpX dontdiff linux-2.6.13-rc7/drivers/char/drm/Kconfig linux-dsd/drivers/char/drm/Kconfig
962--- linux-2.6.13-rc4-git2/drivers/char/drm/Kconfig 2005-07-30 19:46:00.126092873 -0700 962--- linux-2.6.13-rc7/drivers/char/drm/Kconfig 2005-08-24 09:53:25.000000000 +0100
963+++ linux-2.6.13-rc4-git2-gentoo/drivers/char/drm/Kconfig 2005-07-30 19:54:22.350027093 -0700 963+++ linux-dsd/drivers/char/drm/Kconfig 2005-08-29 13:59:53.000000000 +0100
964@@ -6,15 +6,15 @@ 964@@ -6,15 +6,15 @@
965 # 965 #
966 config DRM 966 config DRM
967 tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)" 967 tristate "Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)"
968- depends on (AGP || AGP=n) && PCI 968- depends on (AGP || AGP=n) && PCI
999+ help 999+ help
1000+ Choose this option if you have one of Sun's Creator3D-based graphics 1000+ Choose this option if you have one of Sun's Creator3D-based graphics
1001+ and frame buffer cards. Product page at 1001+ and frame buffer cards. Product page at
1002+ <http://www.sun.com/desktop/products/Graphics/creator3d.html>. 1002+ <http://www.sun.com/desktop/products/Graphics/creator3d.html>.
1003+ 1003+
1004diff -Naurp linux-2.6.13-rc4-git2/drivers/char/Kconfig linux-2.6.13-rc4-git2-gentoo/drivers/char/Kconfig 1004diff -urNpX dontdiff linux-2.6.13-rc7/drivers/char/Kconfig linux-dsd/drivers/char/Kconfig
1005--- linux-2.6.13-rc4-git2/drivers/char/Kconfig 2005-07-30 19:46:00.115094698 -0700 1005--- linux-2.6.13-rc7/drivers/char/Kconfig 2005-08-24 09:53:25.000000000 +0100
1006+++ linux-2.6.13-rc4-git2-gentoo/drivers/char/Kconfig 2005-07-30 19:57:05.398307358 -0700 1006+++ linux-dsd/drivers/char/Kconfig 2005-08-29 14:01:54.000000000 +0100
1007@@ -345,6 +345,13 @@ config AU1000_SERIAL_CONSOLE 1007@@ -345,6 +345,13 @@ config AU1000_SERIAL_CONSOLE
1008 If you have an Alchemy AU1000 processor (MIPS based) and you want 1008 If you have an Alchemy AU1000 processor (MIPS based) and you want
1009 to use a console on a serial port, say Y. Otherwise, say N. 1009 to use a console on a serial port, say Y. Otherwise, say N.
1010 1010
1011+config SUN_AURORA 1011+config SUN_AURORA
1033+ 1033+
1034+ Say Y here unless you are building a special purpose kernel. 1034+ Say Y here unless you are building a special purpose kernel.
1035+ 1035+
1036 config GEN_RTC 1036 config GEN_RTC
1037 tristate "Generic /dev/rtc emulation" 1037 tristate "Generic /dev/rtc emulation"
1038- depends on RTC!=y && !IA64 && !ARM && !PPC64 1038- depends on RTC!=y && !IA64 && !ARM && !PPC64 && !M32R && !SPARC32
1039+ depends on RTC!=y && !IA64 && !ARM && !PPC64 && SUN_MOSTEK_RTC!=y 1039+ depends on RTC!=y && !IA64 && !ARM && !PPC64 && !M32R && !SPARC32 && SUN_MOSTEK_RTC!=y
1040 ---help--- 1040 ---help---
1041 If you say Y here and create a character special file /dev/rtc with 1041 If you say Y here and create a character special file /dev/rtc with
1042 major number 10 and minor number 135 using mknod ("man mknod"), you 1042 major number 10 and minor number 135 using mknod ("man mknod"), you
1043@@ -844,6 +862,30 @@ config TANBAC_TB0219 1043@@ -844,6 +862,30 @@ config TANBAC_TB0219
1044 tristate "TANBAC TB0219 base board support" 1044 tristate "TANBAC TB0219 base board support"
1069+ you should say N to this option. 1069+ you should say N to this option.
1070+ 1070+
1071 1071
1072 menu "Ftape, the floppy tape device driver" 1072 menu "Ftape, the floppy tape device driver"
1073 1073
1074diff -Naurp linux-2.6.13-rc4-git2/drivers/Kconfig linux-2.6.13-rc4-git2-gentoo/drivers/Kconfig 1074diff -urNpX dontdiff linux-2.6.13-rc7/drivers/Kconfig linux-dsd/drivers/Kconfig
1075--- linux-2.6.13-rc4-git2/drivers/Kconfig 2005-07-30 19:45:58.456369955 -0700 1075--- linux-2.6.13-rc7/drivers/Kconfig 2005-08-24 09:53:22.000000000 +0100
1076+++ linux-2.6.13-rc4-git2-gentoo/drivers/Kconfig 2005-07-30 19:54:22.352026766 -0700 1076+++ linux-dsd/drivers/Kconfig 2005-08-29 13:59:53.000000000 +0100
1077@@ -62,4 +62,9 @@ source "drivers/infiniband/Kconfig" 1077@@ -62,4 +62,9 @@ source "drivers/infiniband/Kconfig"
1078 1078
1079 source "drivers/sn/Kconfig" 1079 source "drivers/sn/Kconfig"
1080 1080
1081+if SPARC32 || SPARC64 1081+if SPARC32 || SPARC64
1082+ source "drivers/fc4/Kconfig" 1082+ source "drivers/fc4/Kconfig"
1083+ source "drivers/sbus/char/Kconfig" 1083+ source "drivers/sbus/char/Kconfig"
1084+endif 1084+endif
1085+ 1085+
1086 endmenu 1086 endmenu
1087diff -Naurp linux-2.6.13-rc4-git2/drivers/sbus/char/Kconfig linux-2.6.13-rc4-git2-gentoo/drivers/sbus/char/Kconfig 1087diff -urNpX dontdiff linux-2.6.13-rc7/drivers/sbus/char/Kconfig linux-dsd/drivers/sbus/char/Kconfig
1088--- linux-2.6.13-rc4-git2/drivers/sbus/char/Kconfig 2005-07-30 19:46:09.698504394 -0700 1088--- linux-2.6.13-rc7/drivers/sbus/char/Kconfig 2005-08-24 09:53:41.000000000 +0100
1089+++ linux-2.6.13-rc4-git2-gentoo/drivers/sbus/char/Kconfig 2005-07-30 19:57:50.205963155 -0700 1089+++ linux-dsd/drivers/sbus/char/Kconfig 2005-08-29 13:59:53.000000000 +0100
1090@@ -13,15 +13,6 @@ config SUN_OPENPROMIO 1090@@ -13,15 +13,6 @@ config SUN_OPENPROMIO
1091 1091
1092 If unsure, say Y. 1092 If unsure, say Y.
1093 1093
1094-config SUN_MOSTEK_RTC 1094-config SUN_MOSTEK_RTC
1113- tristate "PC-style Real Time Clock Support" 1113- tristate "PC-style Real Time Clock Support"
1114- depends on PCI && EXPERIMENTAL && SPARC32 1114- depends on PCI && EXPERIMENTAL && SPARC32
1115- 1115-
1116 endmenu 1116 endmenu
1117 1117
1118diff -Naurp linux-2.6.13-rc4-git2/drivers/sbus/Makefile linux-2.6.13-rc4-git2-gentoo/drivers/sbus/Makefile 1118diff -urNpX dontdiff linux-2.6.13-rc7/drivers/sbus/Makefile linux-dsd/drivers/sbus/Makefile
1119--- linux-2.6.13-rc4-git2/drivers/sbus/Makefile 2005-06-17 12:48:29.000000000 -0700 1119--- linux-2.6.13-rc7/drivers/sbus/Makefile 2005-06-17 20:48:29.000000000 +0100
1120+++ linux-2.6.13-rc4-git2-gentoo/drivers/sbus/Makefile 2005-07-30 19:54:22.354026438 -0700 1120+++ linux-dsd/drivers/sbus/Makefile 2005-08-29 13:59:53.000000000 +0100
1121@@ -6,4 +6,4 @@ ifneq ($(ARCH),m68k) 1121@@ -6,4 +6,4 @@ ifneq ($(ARCH),m68k)
1122 obj-y := sbus.o dvma.o 1122 obj-y := sbus.o dvma.o
1123 endif 1123 endif
1124 1124
1125-obj-$(CONFIG_SBUSCHAR) += char/ 1125-obj-$(CONFIG_SBUSCHAR) += char/
1126+obj-y += char/ 1126+obj-y += char/
1127diff -Naurp linux-2.6.13-rc4-git2/fs/Kconfig linux-2.6.13-rc4-git2-gentoo/fs/Kconfig 1127diff -urNpX dontdiff linux-2.6.13-rc7/fs/Kconfig linux-dsd/fs/Kconfig
1128--- linux-2.6.13-rc4-git2/fs/Kconfig 2005-07-30 19:46:15.724504429 -0700 1128--- linux-2.6.13-rc7/fs/Kconfig 2005-08-24 09:53:42.000000000 +0100
1129+++ linux-2.6.13-rc4-git2-gentoo/fs/Kconfig 2005-07-30 19:54:22.356026110 -0700 1129+++ linux-dsd/fs/Kconfig 2005-08-29 13:59:53.000000000 +0100
1130@@ -856,6 +856,20 @@ config RAMFS 1130@@ -859,6 +859,20 @@ config RAMFS
1131 To compile this as a module, choose M here: the module will be called 1131 To compile this as a module, choose M here: the module will be called
1132 ramfs. 1132 ramfs.
1133 1133
1134+config SUN_OPENPROMFS 1134+config SUN_OPENPROMFS
1135+ depends on SPARC32 || SPARC64 1135+ depends on SPARC32 || SPARC64

Legend:
Removed from v.151  
changed lines
  Added in v.152

  ViewVC Help
Powered by ViewVC 1.1.20