Update of /cvsroot/linux-vax/kernel-2.4/arch/sh
In directory sc8-pr-cvs1:/tmp/cvs-serv23180/arch/sh
Modified Files:
config.in vmlinux.lds.S
Log Message:
DA: sync to Marcelo 2.4.18 + remove init_mmap (no longer needed)
Index: config.in
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sh/config.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.in 9 Apr 2002 17:07:20 -0000 1.2
+++ config.in 10 Jun 2003 01:46:15 -0000 1.3
@@ -189,7 +189,7 @@
if [ "$CONFIG_PCI_GODIRECT" = "y" -o "$CONFIG_PCI_GOANY" = "y" ]; then
define_bool CONFIG_PCI_DIRECT y
fi
- define_bool CONFIG_SH_PCIDMA_NONCOHERENT n
+ bool 'Cache and PCI noncoherent' CONFIG_SH_PCIDMA_NONCOHERENT n
fi
source drivers/pci/Config.in
@@ -280,9 +280,9 @@
#
source drivers/input/Config.in
-if [ "$CONFIG_SH_DREAMCAST" = "y" ]; then
- source drivers/maple/Config.in
-fi
+# if [ "$CONFIG_SH_DREAMCAST" = "y" ]; then
+# source drivers/maple/Config.in
+# fi
mainmenu_option next_comment
comment 'Character devices'
Index: vmlinux.lds.S
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/sh/vmlinux.lds.S,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vmlinux.lds.S 9 Apr 2002 17:07:20 -0000 1.2
+++ vmlinux.lds.S 10 Jun 2003 01:46:15 -0000 1.3
@@ -23,7 +23,6 @@
*(.fixup)
*(.gnu.warning)
} = 0x0009
- .text.lock : { *(.text.lock) } /* out-of-line lock text */
.rodata : { *(.rodata) *(.rodata.*) }
.kstrtab : { *(.kstrtab) }
|
