Changeset be76242 in clfs-embedded
- Timestamp:
- Feb 4, 2007, 10:46:05 AM (18 years ago)
- Branches:
- master
- Children:
- 1603a9d
- Parents:
- 961b7c5
- Files:
-
- 2 added
- 8 edited
- 7 moved
Legend:
- Unmodified
- Added
- Removed
-
BOOK/cross-tools/mips/uclibc.xml
r961b7c5 rbe76242 74 74 need at add the following lines to your configuration:</para> 75 75 76 <screen os="m2"><userinput>echo "ARCH_ANY_ENDIAN=y" >>.config77 echo "ARCH_BIG_ENDIAN=y" >>.config78 echo "ARCH_WANTS_BIG_ENDIAN=y" >>.config</userinput></screen>76 <screen os="m2"><userinput>echo "ARCH_ANY_ENDIAN=y" >> .config 77 echo "ARCH_BIG_ENDIAN=y" >> .config 78 echo "ARCH_WANTS_BIG_ENDIAN=y" >> .config</userinput></screen> 79 79 80 80 <para os="m3">If your MIPS system is Little Endian, you will 81 81 need at add the following lines to your configuration:</para> 82 82 83 <screen os="m4"><userinput>echo "ARCH_ANY_ENDIAN=y" >>.config84 echo "ARCH_LITTLE_ENDIAN=y" >>.config85 echo "ARCH_WANTS_LITTLE_ENDIAN=y" >>.config</userinput></screen>83 <screen os="m4"><userinput>echo "ARCH_ANY_ENDIAN=y" >> .config 84 echo "ARCH_LITTLE_ENDIAN=y" >> .config 85 echo "ARCH_WANTS_LITTLE_ENDIAN=y" >> .config</userinput></screen> 86 86 87 87 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" -
BOOK/cross-tools/x86/uclibc.xml
r961b7c5 rbe76242 34 34 35 35 <screen os="d"><userinput>cp Makefile Makefile.orig 36 sed -e 's/$(LN) -fs/cp/g' Makefile.orig >Makefile36 sed -e 's/$(LN) -fs/cp/g' Makefile.orig > Makefile 37 37 for file in `find libc/sysdeps/linux -name Makefile`; do 38 38 cp $file $file.orig … … 72 72 sed -e "s:# ${config} is not set:${config}=y:" .config.orig > .config 73 73 done 74 echo "UCLIBC_HAS_FULL_RPC=y" >>.config75 echo "UCLIBC_HAS_REENTRANT_RPC=y" >>.config</userinput></screen>74 echo "UCLIBC_HAS_FULL_RPC=y" >> .config 75 echo "UCLIBC_HAS_REENTRANT_RPC=y" >> .config</userinput></screen> 76 76 77 77 <para os="l">We have made some changes to our config, let's make sure -
BOOK/final-system/mips-chapter.xml
r961b7c5 rbe76242 15 15 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkgmgt.xml"/> 16 16 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/toolchain.xml"/> 17 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/busybox.xml"/> 17 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/busybox.xml"/> 18 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/> 18 19 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/> 19 20 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/> -
BOOK/final-system/wrt-chapter.xml
r961b7c5 rbe76242 15 15 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkgmgt.xml"/> 16 16 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/toolchain.xml"/> 17 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href=" common/busybox.xml"/>17 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/busybox.xml"/> 18 18 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/> 19 19 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/> -
BOOK/final-system/x86-chapter.xml
r961b7c5 rbe76242 15 15 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkgmgt.xml"/> 16 16 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/toolchain.xml"/> 17 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/busybox.xml"/> 17 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/busybox.xml"/> 18 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/> 18 19 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/> 19 20 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/> -
BOOK/final-system/x86/busybox.xml
r961b7c5 rbe76242 30 30 <title>Installation of Busybox</title> 31 31 32 <para os="p0">Before you build BusyBox, you may want to check the following URL for 33 patches that the upstream maintainer of BusyBox has released to fix issues. 34 <ulink url="http://busybox.net/downloads/fixes-&busybox-version;"/></para> 35 32 36 <para os="p1">The following patch fixes some issues that are related to the 33 37 headers we are using:</para> … … 46 50 47 51 <para os="d">We will need to edit the configuration file, to make sure everything gets 48 compiled and put into it's proper locations:</para>52 compiled:</para> 49 53 50 <screen os="e"><userinput>cp .config .config.orig 51 sed -e "s:# USING_CROSS_COMPILER.*:USING_CROSS_COMPILER=y:" \ 52 -e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${CLFS_TARGET}-\":" \ 53 .config.orig > .config</userinput></screen> 54 <screen os="e"><userinput>BUSYBOX_OPTIONS="CONFIG_DMALLOC CONFIG_BUILD_AT_ONCE CONFIG_BUILD_LIBBUSYBOX 55 CONFIG_FEATURE_SH_IS_NONE CONFIG_LOCALE_SUPPORT CONFIG_TFTP CONFIG_FTPGET CONFIG_FTPPUT 56 CONFIG_IPCALC CONFIG_TFTP CONFIG_HUSH CONFIG_LASH CONFIG_MSH CONFIG_INETD CONFIG_DPKG 57 CONFIG_RPM2CPIO CONFIG_RPM CONFIG_FOLD CONFIG_LOGNAME CONFIG_OD CONFIG_CRONTAB 58 CONFIG_UUDECODE CONFIG_UUENCODE CONFIG_SULOGIN CONFIG_DC CONFIG_DEBUG_YANK_SUSv2 59 CONFIG_DEBUG_INIT CONFIG_DEBUG_CROND_OPTION CONFIG_FEATURE_UDHCP_DEBUG CONFIG_TASKSET 60 CONFIG_CHATTR CONFIG_FSCK CONFIG_LSATTR CONFIG_CHPST CONFIG_SETUIDGID 61 CONFIG_ENVUIDGID CONFIG_ENVDIR CONFIG_SOFTLIMIT CONFIG_FEATURE_2_4_MODULES" 62 for config in $BUSYBOX_OPTIONS; do 63 cp .config .config.orig 64 sed -e "s:${config}=y:${config}=n:" .config.orig > .config 65 done 66 BUSYBOX_OPTIONS="CONFIG_FEATURE_SH_IS_ASH CONFIG_FEATURE_TRACEROUTE_VERBOSE CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE" 67 for config in $BUSYBOX_OPTIONS; do 68 cp .config .config.orig 69 sed -e "s:# ${config} is not set:${config}=y:" .config.orig > .config 70 done</userinput></screen> 54 71 55 72 <para os="f">Compile the package:</para> 56 73 57 <screen os="g"><userinput>make CROSS="${CLFS_TARGET}-" PREFIX="${CLFS}" EXTRA_CFLAGS="${BUILD}" busybox</userinput></screen>74 <screen os="g"><userinput>make ARCH=i386 CROSS_COMPILE="${CLFS_TARGET}-" CFLAGS="${BUILD}"</userinput></screen> 58 75 59 76 <para os="h">Install the package:</para> 60 77 61 <screen os="i"><userinput>make PREFIX="${CLFS}" install</userinput></screen>78 <screen os="i"><userinput>make ARCH=i386 PREFIX="${CLFS}" install</userinput></screen> 62 79 63 80 <para os="j">If your going to build your kernel with modules, you will need to make -
BOOK/general.ent
r961b7c5 rbe76242 3 3 <!ENTITY month "02"> <!-- Use two digits --> 4 4 <!ENTITY month_name "January"> 5 <!ENTITY day "0 3"> <!-- Use two digits -->5 <!ENTITY day "04"> <!-- Use two digits --> 6 6 <!ENTITY year "2007"> <!-- Use four digits --> 7 7 -
BOOK/packages.ent
r961b7c5 rbe76242 11 11 <!ENTITY binutils-home "http://sources.redhat.com/binutils/"> 12 12 13 <!ENTITY busybox-version "1. 2.2.1">14 <!ENTITY busybox-size "1, 385KB">13 <!ENTITY busybox-version "1.4.1"> 14 <!ENTITY busybox-size "1,483 KB"> 15 15 <!ENTITY busybox-url "http://busybox.net/downloads/busybox-&busybox-version;.tar.bz2"> 16 <!ENTITY busybox-md5 " 153f7a4d7580c19ed6f6570f039b64b5">16 <!ENTITY busybox-md5 "5728403bce309cdabcffa414e2e64052"> 17 17 <!ENTITY busybox-home "http://www.busybox.net"> 18 18 … … 22 22 <!ENTITY clfs-bootscripts-md5 "b276c989058a7c2a5ec1ecdf6e08363e"> 23 23 <!ENTITY clfs-bootscripts-home " "> 24 25 <!ENTITY e2fsprogs-version "1.39"> 26 <!ENTITY e2fsprogs-size "3,612 KB"> 27 <!ENTITY e2fsprogs-url "&sourceforge;e2fsprogs/e2fsprogs-&e2fsprogs-version;.tar.gz"> 28 <!ENTITY e2fsprogs-md5 "06f7806782e357797fad1d34b7ced0c6"> 29 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net"> 24 30 25 31 <!ENTITY gcc-version "4.1.1"> … … 37 43 <!ENTITY linux-dl-version "2.6"> 38 44 39 <!ENTITY linux-version "2.6.19 ">40 <!ENTITY linux-size "41,89 6KB">45 <!ENTITY linux-version "2.6.19.2"> 46 <!ENTITY linux-size "41,892 KB"> 41 47 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.bz2"> 42 <!ENTITY linux-md5 " 443c265b57e87eadc0c677c3acc37e20">48 <!ENTITY linux-md5 "ca0ce8f288e8ae93ac243b568f906bf8"> 43 49 <!ENTITY linux-home "http://www.kernel.org/"> 44 50 45 <!ENTITY linux-headers-version "&linux-version;- 12042006">46 <!ENTITY linux-headers-size "1,6 27KB">51 <!ENTITY linux-headers-version "&linux-version;-01232007"> 52 <!ENTITY linux-headers-size "1,636 KB"> 47 53 <!ENTITY linux-headers-url "&packages-root;linux-headers-&linux-headers-version;.tar.bz2"> 48 <!ENTITY linux-headers-md5 " 0bef91b0af3f234829a341e101354d68">54 <!ENTITY linux-headers-md5 "acb30395626a7be00da8056421f7f72f"> 49 55 <!ENTITY linux-headers-home "http://headers.cross-lfs.org/"> 50 56 -
BOOK/patches.ent
r961b7c5 rbe76242 38 38 39 39 <!-- Beyond patches --> 40 40 41 <!ENTITY dropbear-autotool-patch "dropbear-&dropbear-version;-autotool-1.patch"> 41 42 <!ENTITY dropbear-autotool-patch-md5 "eb5c1803aec03ea0d62cf57b4ef9bcb5"> … … 43 44 44 45 <!-- MIPS Patches --> 46 45 47 <!ENTITY linux-mips-patch "linux-&linux-version;-mips-1.patch"> 46 <!ENTITY linux-mips-patch-md5 " 4c75e5302a334649f126a0de3295b883">47 <!ENTITY linux-mips-patch-size "4 64KB">48 <!ENTITY linux-mips-patch-md5 "165e1a3619ebf5ac0a2858b61e860c1d"> 49 <!ENTITY linux-mips-patch-size "480 KB"> 48 50 49 51 <!ENTITY linux-mips_fixes-patch "linux-&linux-version;-mips_fixes-1.patch"> -
patches/linux-2.6.19.2-mips-1.patch
r961b7c5 rbe76242 1 1 Submitted By: Jim Gifford (patches at jg555 dot com) 2 Date: 2006-1 1-293 Initial Package Version: 2.6.19 2 Date: 2006-12-12 3 Initial Package Version: 2.6.19.1 4 4 Origin: Linux-MIPS 5 5 Upstream Status: http://www.linux-mips.org/pub/linux/mips/kernel/v2.6/ 6 6 7 diff -Naur linux-2.6.19 /arch/mips/Kconfig linux-mips-2.6.19/arch/mips/Kconfig8 --- linux-2.6.19 /arch/mips/Kconfig 2006-11-29 13:57:37.000000000 -08009 +++ linux-mips-2.6.19 /arch/mips/Kconfig 2006-11-29 15:23:09.000000000 -08007 diff -Naur linux-2.6.19.1/arch/mips/Kconfig linux-mips-2.6.19.1/arch/mips/Kconfig 8 --- linux-2.6.19.1/arch/mips/Kconfig 2006-12-11 11:32:53.000000000 -0800 9 +++ linux-mips-2.6.19.1/arch/mips/Kconfig 2006-12-11 15:38:26.000000000 -0800 10 10 @@ -468,8 +468,6 @@ 11 11 config MACH_VR41XX … … 38 38 bool "Kernel support for o32 binaries" 39 39 depends on MIPS32_COMPAT 40 diff -Naur linux-2.6.19 /arch/mips/au1000/common/pci.c linux-mips-2.6.19/arch/mips/au1000/common/pci.c41 --- linux-2.6.19 /arch/mips/au1000/common/pci.c 2006-11-29 13:57:37.000000000 -080042 +++ linux-mips-2.6.19 /arch/mips/au1000/common/pci.c 2006-11-29 15:23:09.000000000 -080040 diff -Naur linux-2.6.19.1/arch/mips/au1000/common/pci.c linux-mips-2.6.19.1/arch/mips/au1000/common/pci.c 41 --- linux-2.6.19.1/arch/mips/au1000/common/pci.c 2006-12-11 11:32:53.000000000 -0800 42 +++ linux-mips-2.6.19.1/arch/mips/au1000/common/pci.c 2006-12-11 15:38:26.000000000 -0800 43 43 @@ -76,13 +76,17 @@ 44 44 } … … 66 66 #endif 67 67 68 diff -Naur linux-2.6.19 /arch/mips/au1000/common/setup.c linux-mips-2.6.19/arch/mips/au1000/common/setup.c69 --- linux-2.6.19 /arch/mips/au1000/common/setup.c 2006-11-29 13:57:37.000000000 -080070 +++ linux-mips-2.6.19 /arch/mips/au1000/common/setup.c 2006-11-29 15:23:09.000000000 -080068 diff -Naur linux-2.6.19.1/arch/mips/au1000/common/setup.c linux-mips-2.6.19.1/arch/mips/au1000/common/setup.c 69 --- linux-2.6.19.1/arch/mips/au1000/common/setup.c 2006-12-11 11:32:53.000000000 -0800 70 +++ linux-mips-2.6.19.1/arch/mips/au1000/common/setup.c 2006-12-11 15:38:26.000000000 -0800 71 71 @@ -141,17 +141,20 @@ 72 72 /* This routine should be valid for all Au1x based boards */ … … 98 98 #endif 99 99 100 diff -Naur linux-2.6.19 /arch/mips/au1000/pb1100/board_setup.c linux-mips-2.6.19/arch/mips/au1000/pb1100/board_setup.c101 --- linux-2.6.19 /arch/mips/au1000/pb1100/board_setup.c 2006-11-29 13:57:37.000000000 -0800102 +++ linux-mips-2.6.19 /arch/mips/au1000/pb1100/board_setup.c 2006-11-29 15:23:09.000000000 -0800100 diff -Naur linux-2.6.19.1/arch/mips/au1000/pb1100/board_setup.c linux-mips-2.6.19.1/arch/mips/au1000/pb1100/board_setup.c 101 --- linux-2.6.19.1/arch/mips/au1000/pb1100/board_setup.c 2006-12-11 11:32:53.000000000 -0800 102 +++ linux-mips-2.6.19.1/arch/mips/au1000/pb1100/board_setup.c 2006-12-11 15:38:26.000000000 -0800 103 103 @@ -47,8 +47,7 @@ 104 104 … … 216 216 } 217 217 } 218 diff -Naur linux-2.6.19/arch/mips/kernel/linux32.c linux-mips-2.6.19/arch/mips/kernel/linux32.c 219 --- linux-2.6.19/arch/mips/kernel/linux32.c 2006-11-29 13:57:37.000000000 -0800 220 +++ linux-mips-2.6.19/arch/mips/kernel/linux32.c 2006-11-29 15:23:09.000000000 -0800 218 diff -Naur linux-2.6.19.1/arch/mips/configs/malta_defconfig linux-mips-2.6.19.1/arch/mips/configs/malta_defconfig 219 --- linux-2.6.19.1/arch/mips/configs/malta_defconfig 2006-12-11 11:32:53.000000000 -0800 220 +++ linux-mips-2.6.19.1/arch/mips/configs/malta_defconfig 2006-12-11 15:38:26.000000000 -0800 221 @@ -644,7 +644,85 @@ 222 # 223 # Memory Technology Devices (MTD) 224 # 225 -# CONFIG_MTD is not set 226 +CONFIG_MTD=y 227 +# CONFIG_MTD_DEBUG is not set 228 +# CONFIG_MTD_CONCAT is not set 229 +CONFIG_MTD_PARTITIONS=y 230 +# CONFIG_MTD_REDBOOT_PARTS is not set 231 +# CONFIG_MTD_CMDLINE_PARTS is not set 232 + 233 +# 234 +# User Modules And Translation Layers 235 +# 236 +CONFIG_MTD_CHAR=y 237 +CONFIG_MTD_BLOCK=y 238 +# CONFIG_FTL is not set 239 +# CONFIG_NFTL is not set 240 +# CONFIG_INFTL is not set 241 +# CONFIG_RFD_FTL is not set 242 +# CONFIG_SSFDC is not set 243 + 244 +# 245 +# RAM/ROM/Flash chip drivers 246 +# 247 +CONFIG_MTD_CFI=y 248 +# CONFIG_MTD_JEDECPROBE is not set 249 +CONFIG_MTD_GEN_PROBE=y 250 +# CONFIG_MTD_CFI_ADV_OPTIONS is not set 251 +CONFIG_MTD_MAP_BANK_WIDTH_1=y 252 +CONFIG_MTD_MAP_BANK_WIDTH_2=y 253 +CONFIG_MTD_MAP_BANK_WIDTH_4=y 254 +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set 255 +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set 256 +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set 257 +CONFIG_MTD_CFI_I1=y 258 +CONFIG_MTD_CFI_I2=y 259 +# CONFIG_MTD_CFI_I4 is not set 260 +# CONFIG_MTD_CFI_I8 is not set 261 +CONFIG_MTD_CFI_INTELEXT=y 262 +CONFIG_MTD_CFI_AMDSTD=y 263 +CONFIG_MTD_CFI_STAA=y 264 +CONFIG_MTD_CFI_UTIL=y 265 +# CONFIG_MTD_RAM is not set 266 +# CONFIG_MTD_ROM is not set 267 +# CONFIG_MTD_ABSENT is not set 268 +# CONFIG_MTD_OBSOLETE_CHIPS is not set 269 + 270 +# 271 +# Mapping drivers for chip access 272 +# 273 +# CONFIG_MTD_COMPLEX_MAPPINGS is not set 274 +CONFIG_MTD_PHYSMAP=y 275 +CONFIG_MTD_PHYSMAP_START=0x0 276 +CONFIG_MTD_PHYSMAP_LEN=0x0 277 +CONFIG_MTD_PHYSMAP_BANKWIDTH=0 278 +# CONFIG_MTD_PLATRAM is not set 279 + 280 +# 281 +# Self-contained MTD device drivers 282 +# 283 +# CONFIG_MTD_PMC551 is not set 284 +# CONFIG_MTD_SLRAM is not set 285 +# CONFIG_MTD_PHRAM is not set 286 +# CONFIG_MTD_MTDRAM is not set 287 +# CONFIG_MTD_BLOCK2MTD is not set 288 + 289 +# 290 +# Disk-On-Chip Device Drivers 291 +# 292 +# CONFIG_MTD_DOC2000 is not set 293 +# CONFIG_MTD_DOC2001 is not set 294 +# CONFIG_MTD_DOC2001PLUS is not set 295 + 296 +# 297 +# NAND Flash Device Drivers 298 +# 299 +# CONFIG_MTD_NAND is not set 300 + 301 +# 302 +# OneNAND Flash Device Drivers 303 +# 304 +# CONFIG_MTD_ONENAND is not set 305 306 # 307 # Parallel port support 308 diff -Naur linux-2.6.19.1/arch/mips/kernel/linux32.c linux-mips-2.6.19.1/arch/mips/kernel/linux32.c 309 --- linux-2.6.19.1/arch/mips/kernel/linux32.c 2006-12-11 11:32:53.000000000 -0800 310 +++ linux-mips-2.6.19.1/arch/mips/kernel/linux32.c 2006-12-11 15:38:26.000000000 -0800 221 311 @@ -382,531 +382,6 @@ 222 312 return ret; … … 842 932 struct sysctl_args32 843 933 { 844 diff -Naur linux-2.6.19 /arch/mips/kernel/mips-mt.c linux-mips-2.6.19/arch/mips/kernel/mips-mt.c845 --- linux-2.6.19 /arch/mips/kernel/mips-mt.c 2006-11-29 13:57:37.000000000 -0800846 +++ linux-mips-2.6.19 /arch/mips/kernel/mips-mt.c 2006-11-29 15:23:09.000000000 -0800934 diff -Naur linux-2.6.19.1/arch/mips/kernel/mips-mt.c linux-mips-2.6.19.1/arch/mips/kernel/mips-mt.c 935 --- linux-2.6.19.1/arch/mips/kernel/mips-mt.c 2006-12-11 11:32:53.000000000 -0800 936 +++ linux-mips-2.6.19.1/arch/mips/kernel/mips-mt.c 2006-12-11 15:38:26.000000000 -0800 847 937 @@ -96,6 +96,10 @@ 848 938 goto out_unlock; … … 868 958 cpus_and(mask, p->thread.user_cpus_allowed, cpu_possible_map); 869 959 870 diff -Naur linux-2.6.19 /arch/mips/kernel/ptrace.c linux-mips-2.6.19/arch/mips/kernel/ptrace.c871 --- linux-2.6.19 /arch/mips/kernel/ptrace.c 2006-11-29 13:57:37.000000000 -0800872 +++ linux-mips-2.6.19 /arch/mips/kernel/ptrace.c 2006-11-29 15:23:09.000000000 -0800960 diff -Naur linux-2.6.19.1/arch/mips/kernel/ptrace.c linux-mips-2.6.19.1/arch/mips/kernel/ptrace.c 961 --- linux-2.6.19.1/arch/mips/kernel/ptrace.c 2006-12-11 11:32:53.000000000 -0800 962 +++ linux-mips-2.6.19.1/arch/mips/kernel/ptrace.c 2006-12-11 15:38:26.000000000 -0800 873 963 @@ -20,12 +20,12 @@ 874 964 #include <linux/mm.h> … … 922 1012 + regs->regs[6], regs->regs[7]); 923 1013 } 924 diff -Naur linux-2.6.19/arch/mips/kernel/scall64-n32.S linux-mips-2.6.19/arch/mips/kernel/scall64-n32.S 925 --- linux-2.6.19/arch/mips/kernel/scall64-n32.S 2006-11-29 13:57:37.000000000 -0800 926 +++ linux-mips-2.6.19/arch/mips/kernel/scall64-n32.S 2006-11-29 15:23:09.000000000 -0800 1014 diff -Naur linux-2.6.19.1/arch/mips/kernel/reset.c linux-mips-2.6.19.1/arch/mips/kernel/reset.c 1015 --- linux-2.6.19.1/arch/mips/kernel/reset.c 2006-12-11 11:32:53.000000000 -0800 1016 +++ linux-mips-2.6.19.1/arch/mips/kernel/reset.c 2006-12-11 15:38:26.000000000 -0800 1017 @@ -23,6 +23,8 @@ 1018 void (*_machine_halt)(void); 1019 void (*pm_power_off)(void); 1020 1021 +EXPORT_SYMBOL(pm_power_off); 1022 + 1023 void machine_restart(char *command) 1024 { 1025 if (_machine_restart) 1026 diff -Naur linux-2.6.19.1/arch/mips/kernel/scall64-n32.S linux-mips-2.6.19.1/arch/mips/kernel/scall64-n32.S 1027 --- linux-2.6.19.1/arch/mips/kernel/scall64-n32.S 2006-12-11 11:32:53.000000000 -0800 1028 +++ linux-mips-2.6.19.1/arch/mips/kernel/scall64-n32.S 2006-12-11 15:38:26.000000000 -0800 927 1029 @@ -149,8 +149,8 @@ 928 1030 PTR sys_mincore … … 962 1064 PTR compat_sys_statfs64 963 1065 PTR compat_sys_fstatfs64 964 diff -Naur linux-2.6.19/arch/mips/lib/Makefile linux-mips-2.6.19/arch/mips/lib/Makefile 965 --- linux-2.6.19/arch/mips/lib/Makefile 2006-11-29 13:57:37.000000000 -0800 966 +++ linux-mips-2.6.19/arch/mips/lib/Makefile 2006-11-29 15:23:09.000000000 -0800 1066 diff -Naur linux-2.6.19.1/arch/mips/kernel/vmlinux.lds.S linux-mips-2.6.19.1/arch/mips/kernel/vmlinux.lds.S 1067 --- linux-2.6.19.1/arch/mips/kernel/vmlinux.lds.S 2006-12-11 11:32:53.000000000 -0800 1068 +++ linux-mips-2.6.19.1/arch/mips/kernel/vmlinux.lds.S 2006-12-11 15:38:26.000000000 -0800 1069 @@ -112,6 +112,7 @@ 1070 /* .exit.text is discarded at runtime, not link time, to deal with 1071 references from .rodata */ 1072 .exit.text : { *(.exit.text) } 1073 + .exit.data : { *(.exit.data) } 1074 . = ALIGN(_PAGE_SIZE); 1075 __initramfs_start = .; 1076 .init.ramfs : { *(.init.ramfs) } 1077 @@ -139,7 +140,6 @@ 1078 1079 /* Sections to be discarded */ 1080 /DISCARD/ : { 1081 - *(.exit.data) 1082 *(.exitcall.exit) 1083 1084 /* ABI crap starts here */ 1085 diff -Naur linux-2.6.19.1/arch/mips/lib/Makefile linux-mips-2.6.19.1/arch/mips/lib/Makefile 1086 --- linux-2.6.19.1/arch/mips/lib/Makefile 2006-12-11 11:32:53.000000000 -0800 1087 +++ linux-mips-2.6.19.1/arch/mips/lib/Makefile 2006-12-11 15:38:26.000000000 -0800 967 1088 @@ -5,8 +5,6 @@ 968 1089 lib-y += csum_partial_copy.o memcpy.o promlib.o strlen_user.o strncpy_user.o \ … … 974 1095 lib-y += ashldi3.o ashrdi3.o lshrdi3.o 975 1096 976 diff -Naur linux-2.6.19/arch/mips/lib/iomap.c linux-mips-2.6.19/arch/mips/lib/iomap.c 977 --- linux-2.6.19/arch/mips/lib/iomap.c 2006-11-29 13:57:37.000000000 -0800 978 +++ linux-mips-2.6.19/arch/mips/lib/iomap.c 1969-12-31 16:00:00.000000000 -0800 1097 diff -Naur linux-2.6.19.1/arch/mips/lib/csum_partial_copy.c linux-mips-2.6.19.1/arch/mips/lib/csum_partial_copy.c 1098 --- linux-2.6.19.1/arch/mips/lib/csum_partial_copy.c 2006-12-11 11:32:53.000000000 -0800 1099 +++ linux-mips-2.6.19.1/arch/mips/lib/csum_partial_copy.c 2006-12-11 15:38:26.000000000 -0800 1100 @@ -7,6 +7,7 @@ 1101 * Copyright (C) 1998, 1999 Ralf Baechle 1102 */ 1103 #include <linux/kernel.h> 1104 +#include <linux/module.h> 1105 #include <linux/types.h> 1106 #include <asm/byteorder.h> 1107 #include <asm/string.h> 1108 @@ -29,6 +30,8 @@ 1109 return sum; 1110 } 1111 1112 +EXPORT_SYMBOL(csum_partial_copy_nocheck); 1113 + 1114 /* 1115 * Copy from userspace and compute checksum. If we catch an exception 1116 * then zero the rest of the buffer. 1117 diff -Naur linux-2.6.19.1/arch/mips/lib/iomap.c linux-mips-2.6.19.1/arch/mips/lib/iomap.c 1118 --- linux-2.6.19.1/arch/mips/lib/iomap.c 2006-12-11 11:32:53.000000000 -0800 1119 +++ linux-mips-2.6.19.1/arch/mips/lib/iomap.c 1969-12-31 16:00:00.000000000 -0800 979 1120 @@ -1,78 +0,0 @@ 980 1121 -/* … … 1056 1197 -EXPORT_SYMBOL(pci_iomap); 1057 1198 -EXPORT_SYMBOL(pci_iounmap); 1058 diff -Naur linux-2.6.19 /arch/mips/lib-32/dump_tlb.c linux-mips-2.6.19/arch/mips/lib-32/dump_tlb.c1059 --- linux-2.6.19 /arch/mips/lib-32/dump_tlb.c 2006-11-29 13:57:37.000000000 -08001060 +++ linux-mips-2.6.19 /arch/mips/lib-32/dump_tlb.c 2006-11-29 15:23:09.000000000 -08001199 diff -Naur linux-2.6.19.1/arch/mips/lib-32/dump_tlb.c linux-mips-2.6.19.1/arch/mips/lib-32/dump_tlb.c 1200 --- linux-2.6.19.1/arch/mips/lib-32/dump_tlb.c 2006-12-11 11:32:53.000000000 -0800 1201 +++ linux-mips-2.6.19.1/arch/mips/lib-32/dump_tlb.c 2006-12-11 15:38:26.000000000 -0800 1061 1202 @@ -40,8 +40,6 @@ 1062 1203 return "256Mb"; … … 1068 1209 1069 1210 #define BARRIER() \ 1070 diff -Naur linux-2.6.19 /arch/mips/lib-64/dump_tlb.c linux-mips-2.6.19/arch/mips/lib-64/dump_tlb.c1071 --- linux-2.6.19 /arch/mips/lib-64/dump_tlb.c 2006-11-29 13:57:37.000000000 -08001072 +++ linux-mips-2.6.19 /arch/mips/lib-64/dump_tlb.c 2006-11-29 15:23:09.000000000 -08001211 diff -Naur linux-2.6.19.1/arch/mips/lib-64/dump_tlb.c linux-mips-2.6.19.1/arch/mips/lib-64/dump_tlb.c 1212 --- linux-2.6.19.1/arch/mips/lib-64/dump_tlb.c 2006-12-11 11:32:53.000000000 -0800 1213 +++ linux-mips-2.6.19.1/arch/mips/lib-64/dump_tlb.c 2006-12-11 15:38:26.000000000 -0800 1073 1214 @@ -31,8 +31,6 @@ 1074 1215 case PM_256M: return "256Mb"; … … 1080 1221 1081 1222 #define BARRIER() \ 1082 diff -Naur linux-2.6.19/arch/mips/mm/init.c linux-mips-2.6.19/arch/mips/mm/init.c 1083 --- linux-2.6.19/arch/mips/mm/init.c 2006-11-29 13:57:37.000000000 -0800 1084 +++ linux-mips-2.6.19/arch/mips/mm/init.c 2006-11-29 15:23:09.000000000 -0800 1223 diff -Naur linux-2.6.19.1/arch/mips/mips-boards/malta/Makefile linux-mips-2.6.19.1/arch/mips/mips-boards/malta/Makefile 1224 --- linux-2.6.19.1/arch/mips/mips-boards/malta/Makefile 2006-12-11 11:32:53.000000000 -0800 1225 +++ linux-mips-2.6.19.1/arch/mips/mips-boards/malta/Makefile 2006-12-11 15:38:26.000000000 -0800 1226 @@ -19,5 +19,5 @@ 1227 # under Linux. 1228 # 1229 1230 -obj-y := malta_int.o malta_setup.o 1231 +obj-y := malta_int.o malta_mtd.o malta_setup.o 1232 obj-$(CONFIG_SMP) += malta_smp.o 1233 diff -Naur linux-2.6.19.1/arch/mips/mips-boards/malta/malta_setup.c linux-mips-2.6.19.1/arch/mips/mips-boards/malta/malta_setup.c 1234 --- linux-2.6.19.1/arch/mips/mips-boards/malta/malta_setup.c 2006-12-11 11:32:53.000000000 -0800 1235 +++ linux-mips-2.6.19.1/arch/mips/mips-boards/malta/malta_setup.c 2006-12-11 15:38:26.000000000 -0800 1236 @@ -21,13 +21,6 @@ 1237 #include <linux/pci.h> 1238 #include <linux/screen_info.h> 1239 1240 -#ifdef CONFIG_MTD 1241 -#include <linux/mtd/partitions.h> 1242 -#include <linux/mtd/physmap.h> 1243 -#include <linux/mtd/mtd.h> 1244 -#include <linux/mtd/map.h> 1245 -#endif 1246 - 1247 #include <asm/cpu.h> 1248 #include <asm/bootinfo.h> 1249 #include <asm/irq.h> 1250 @@ -58,30 +51,6 @@ 1251 { .name = "dma2", .start = 0xc0, .end = 0xdf, .flags = IORESOURCE_BUSY }, 1252 }; 1253 1254 -#ifdef CONFIG_MTD 1255 -static struct mtd_partition malta_mtd_partitions[] = { 1256 - { 1257 - .name = "YAMON", 1258 - .offset = 0x0, 1259 - .size = 0x100000, 1260 - .mask_flags = MTD_WRITEABLE 1261 - }, 1262 - { 1263 - .name = "User FS", 1264 - .offset = 0x100000, 1265 - .size = 0x2e0000 1266 - }, 1267 - { 1268 - .name = "Board Config", 1269 - .offset = 0x3e0000, 1270 - .size = 0x020000, 1271 - .mask_flags = MTD_WRITEABLE 1272 - } 1273 -}; 1274 - 1275 -#define number_partitions (sizeof(malta_mtd_partitions)/sizeof(struct mtd_partition)) 1276 -#endif 1277 - 1278 const char *get_system_type(void) 1279 { 1280 return "MIPS Malta"; 1281 @@ -211,14 +180,6 @@ 1282 #endif 1283 #endif 1284 1285 -#ifdef CONFIG_MTD 1286 - /* 1287 - * Support for MTD on Malta. Use the generic physmap driver 1288 - */ 1289 - physmap_configure(0x1e000000, 0x400000, 4, NULL); 1290 - physmap_set_partitions(malta_mtd_partitions, number_partitions); 1291 -#endif 1292 - 1293 mips_reboot_setup(); 1294 1295 board_time_init = mips_time_init; 1296 diff -Naur linux-2.6.19.1/arch/mips/mm/cache.c linux-mips-2.6.19.1/arch/mips/mm/cache.c 1297 --- linux-2.6.19.1/arch/mips/mm/cache.c 2006-12-11 11:32:53.000000000 -0800 1298 +++ linux-mips-2.6.19.1/arch/mips/mm/cache.c 2006-12-11 15:38:26.000000000 -0800 1299 @@ -32,6 +32,7 @@ 1300 void (*flush_data_cache_page)(unsigned long addr); 1301 void (*flush_icache_all)(void); 1302 1303 +EXPORT_SYMBOL_GPL(local_flush_data_cache_page); 1304 EXPORT_SYMBOL(flush_data_cache_page); 1305 1306 #ifdef CONFIG_DMA_NONCOHERENT 1307 diff -Naur linux-2.6.19.1/arch/mips/mm/init.c linux-mips-2.6.19.1/arch/mips/mm/init.c 1308 --- linux-2.6.19.1/arch/mips/mm/init.c 2006-12-11 11:32:53.000000000 -0800 1309 +++ linux-mips-2.6.19.1/arch/mips/mm/init.c 2006-12-11 15:38:26.000000000 -0800 1085 1310 @@ -203,6 +203,31 @@ 1086 1311 preempt_check_resched(); … … 1115 1340 struct page *page, unsigned long vaddr, void *dst, const void *src, 1116 1341 unsigned long len) 1117 diff -Naur linux-2.6.19 /arch/mips/momentum/jaguar_atx/Makefile linux-mips-2.6.19/arch/mips/momentum/jaguar_atx/Makefile1118 --- linux-2.6.19 /arch/mips/momentum/jaguar_atx/Makefile 2006-11-29 13:57:37.000000000 -08001119 +++ linux-mips-2.6.19 /arch/mips/momentum/jaguar_atx/Makefile 2006-11-29 15:23:09.000000000 -08001342 diff -Naur linux-2.6.19.1/arch/mips/momentum/jaguar_atx/Makefile linux-mips-2.6.19.1/arch/mips/momentum/jaguar_atx/Makefile 1343 --- linux-2.6.19.1/arch/mips/momentum/jaguar_atx/Makefile 2006-12-11 11:32:53.000000000 -0800 1344 +++ linux-mips-2.6.19.1/arch/mips/momentum/jaguar_atx/Makefile 2006-12-11 15:38:26.000000000 -0800 1120 1345 @@ -6,7 +6,7 @@ 1121 1346 # unless it's something special (ie not a .c file). … … 1127 1352 obj-$(CONFIG_SERIAL_8250_CONSOLE) += ja-console.o 1128 1353 obj-$(CONFIG_REMOTE_DEBUG) += dbg_io.o 1129 diff -Naur linux-2.6.19 /arch/mips/momentum/jaguar_atx/jaguar_atx_fpga.h linux-mips-2.6.19/arch/mips/momentum/jaguar_atx/jaguar_atx_fpga.h1130 --- linux-2.6.19 /arch/mips/momentum/jaguar_atx/jaguar_atx_fpga.h 2006-11-29 13:57:37.000000000 -08001131 +++ linux-mips-2.6.19 /arch/mips/momentum/jaguar_atx/jaguar_atx_fpga.h 2006-11-29 15:23:09.000000000 -08001354 diff -Naur linux-2.6.19.1/arch/mips/momentum/jaguar_atx/jaguar_atx_fpga.h linux-mips-2.6.19.1/arch/mips/momentum/jaguar_atx/jaguar_atx_fpga.h 1355 --- linux-2.6.19.1/arch/mips/momentum/jaguar_atx/jaguar_atx_fpga.h 2006-12-11 11:32:53.000000000 -0800 1356 +++ linux-mips-2.6.19.1/arch/mips/momentum/jaguar_atx/jaguar_atx_fpga.h 2006-12-11 15:38:26.000000000 -0800 1132 1357 @@ -46,7 +46,9 @@ 1133 1358 … … 1142 1367 1143 1368 #endif 1144 diff -Naur linux-2.6.19 /arch/mips/momentum/jaguar_atx/platform.c linux-mips-2.6.19/arch/mips/momentum/jaguar_atx/platform.c1145 --- linux-2.6.19 /arch/mips/momentum/jaguar_atx/platform.c 1969-12-31 16:00:00.000000000 -08001146 +++ linux-mips-2.6.19 /arch/mips/momentum/jaguar_atx/platform.c 2006-11-29 15:23:09.000000000 -08001369 diff -Naur linux-2.6.19.1/arch/mips/momentum/jaguar_atx/platform.c linux-mips-2.6.19.1/arch/mips/momentum/jaguar_atx/platform.c 1370 --- linux-2.6.19.1/arch/mips/momentum/jaguar_atx/platform.c 1969-12-31 16:00:00.000000000 -0800 1371 +++ linux-mips-2.6.19.1/arch/mips/momentum/jaguar_atx/platform.c 2006-12-11 15:38:26.000000000 -0800 1147 1372 @@ -0,0 +1,235 @@ 1148 1373 +#include <linux/delay.h> … … 1381 1606 + 1382 1607 +#endif /* defined(CONFIG_MV643XX_ETH) || defined(CONFIG_MV643XX_ETH_MODULE) */ 1383 diff -Naur linux-2.6.19 /arch/mips/momentum/jaguar_atx/prom.c linux-mips-2.6.19/arch/mips/momentum/jaguar_atx/prom.c1384 --- linux-2.6.19 /arch/mips/momentum/jaguar_atx/prom.c 2006-11-29 13:57:37.000000000 -08001385 +++ linux-mips-2.6.19 /arch/mips/momentum/jaguar_atx/prom.c 2006-11-29 15:23:09.000000000 -08001608 diff -Naur linux-2.6.19.1/arch/mips/momentum/jaguar_atx/prom.c linux-mips-2.6.19.1/arch/mips/momentum/jaguar_atx/prom.c 1609 --- linux-2.6.19.1/arch/mips/momentum/jaguar_atx/prom.c 2006-12-11 11:32:53.000000000 -0800 1610 +++ linux-mips-2.6.19.1/arch/mips/momentum/jaguar_atx/prom.c 2006-12-11 15:38:26.000000000 -0800 1386 1611 @@ -39,56 +39,6 @@ 1387 1612 return "Momentum Jaguar-ATX"; … … 1453 1678 1454 1679 unsigned long __init prom_free_prom_memory(void) 1455 diff -Naur linux-2.6.19 /arch/mips/pci/fixup-tb0219.c linux-mips-2.6.19/arch/mips/pci/fixup-tb0219.c1456 --- linux-2.6.19 /arch/mips/pci/fixup-tb0219.c 2006-11-29 13:57:37.000000000 -08001457 +++ linux-mips-2.6.19 /arch/mips/pci/fixup-tb0219.c 2006-11-29 15:23:09.000000000 -08001680 diff -Naur linux-2.6.19.1/arch/mips/pci/fixup-tb0219.c linux-mips-2.6.19.1/arch/mips/pci/fixup-tb0219.c 1681 --- linux-2.6.19.1/arch/mips/pci/fixup-tb0219.c 2006-12-11 11:32:53.000000000 -0800 1682 +++ linux-mips-2.6.19.1/arch/mips/pci/fixup-tb0219.c 2006-12-11 15:38:26.000000000 -0800 1458 1683 @@ -2,7 +2,7 @@ 1459 1684 * fixup-tb0219.c, The TANBAC TB0219 specific PCI fixups. … … 1465 1690 * This program is free software; you can redistribute it and/or modify 1466 1691 * it under the terms of the GNU General Public License as published by 1467 diff -Naur linux-2.6.19 /arch/mips/qemu/Makefile linux-mips-2.6.19/arch/mips/qemu/Makefile1468 --- linux-2.6.19 /arch/mips/qemu/Makefile 2006-11-29 13:57:37.000000000 -08001469 +++ linux-mips-2.6.19 /arch/mips/qemu/Makefile 2006-11-29 15:23:09.000000000 -08001692 diff -Naur linux-2.6.19.1/arch/mips/qemu/Makefile linux-mips-2.6.19.1/arch/mips/qemu/Makefile 1693 --- linux-2.6.19.1/arch/mips/qemu/Makefile 2006-12-11 11:32:53.000000000 -0800 1694 +++ linux-mips-2.6.19.1/arch/mips/qemu/Makefile 2006-12-11 15:38:26.000000000 -0800 1470 1695 @@ -4,4 +4,5 @@ 1471 1696 … … 1474 1699 +obj-$(CONFIG_VT) += q-vga.o 1475 1700 obj-$(CONFIG_SMP) += q-smp.o 1476 diff -Naur linux-2.6.19 /arch/mips/qemu/q-setup.c linux-mips-2.6.19/arch/mips/qemu/q-setup.c1477 --- linux-2.6.19 /arch/mips/qemu/q-setup.c 2006-11-29 13:57:37.000000000 -08001478 +++ linux-mips-2.6.19 /arch/mips/qemu/q-setup.c 2006-11-29 15:23:09.000000000 -08001701 diff -Naur linux-2.6.19.1/arch/mips/qemu/q-setup.c linux-mips-2.6.19.1/arch/mips/qemu/q-setup.c 1702 --- linux-2.6.19.1/arch/mips/qemu/q-setup.c 2006-12-11 11:32:53.000000000 -0800 1703 +++ linux-mips-2.6.19.1/arch/mips/qemu/q-setup.c 2006-12-11 15:38:26.000000000 -0800 1479 1704 @@ -2,6 +2,7 @@ 1480 1705 #include <asm/io.h> … … 1495 1720 qemu_reboot_setup(); 1496 1721 } 1497 diff -Naur linux-2.6.19 /arch/mips/qemu/q-vga.c linux-mips-2.6.19/arch/mips/qemu/q-vga.c1498 --- linux-2.6.19 /arch/mips/qemu/q-vga.c 1969-12-31 16:00:00.000000000 -08001499 +++ linux-mips-2.6.19 /arch/mips/qemu/q-vga.c 2006-11-29 15:23:09.000000000 -08001722 diff -Naur linux-2.6.19.1/arch/mips/qemu/q-vga.c linux-mips-2.6.19.1/arch/mips/qemu/q-vga.c 1723 --- linux-2.6.19.1/arch/mips/qemu/q-vga.c 1969-12-31 16:00:00.000000000 -0800 1724 +++ linux-mips-2.6.19.1/arch/mips/qemu/q-vga.c 2006-12-11 15:38:26.000000000 -0800 1500 1725 @@ -0,0 +1,189 @@ 1501 1726 +/* … … 1688 1913 +#endif 1689 1914 +} 1690 diff -Naur linux-2.6.19/drivers/char/Kconfig linux-mips-2.6.19/drivers/char/Kconfig 1691 --- linux-2.6.19/drivers/char/Kconfig 2006-11-29 13:57:37.000000000 -0800 1692 +++ linux-mips-2.6.19/drivers/char/Kconfig 2006-11-29 15:23:09.000000000 -0800 1915 diff -Naur linux-2.6.19.1/arch/mips/sibyte/swarm/setup.c linux-mips-2.6.19.1/arch/mips/sibyte/swarm/setup.c 1916 --- linux-2.6.19.1/arch/mips/sibyte/swarm/setup.c 2006-12-11 11:32:53.000000000 -0800 1917 +++ linux-mips-2.6.19.1/arch/mips/sibyte/swarm/setup.c 2006-12-11 15:38:26.000000000 -0800 1918 @@ -43,7 +43,7 @@ 1919 #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X) 1920 #include <asm/sibyte/sb1250_regs.h> 1921 #else 1922 -#error invalid SiByte board configuation 1923 +#error invalid SiByte board configuration 1924 #endif 1925 #include <asm/sibyte/sb1250_genbus.h> 1926 #include <asm/sibyte/board.h> 1927 @@ -53,7 +53,7 @@ 1928 #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X) 1929 extern void sb1250_setup(void); 1930 #else 1931 -#error invalid SiByte board configuation 1932 +#error invalid SiByte board configuration 1933 #endif 1934 1935 extern int xicor_probe(void); 1936 @@ -90,7 +90,7 @@ 1937 #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X) 1938 sb1250_time_init(); 1939 #else 1940 -#error invalid SiByte board configuation 1941 +#error invalid SiByte board configuration 1942 #endif 1943 } 1944 1945 @@ -111,7 +111,7 @@ 1946 #elif defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X) 1947 sb1250_setup(); 1948 #else 1949 -#error invalid SiByte board configuation 1950 +#error invalid SiByte board configuration 1951 #endif 1952 1953 panic_timeout = 5; /* For debug. */ 1954 diff -Naur linux-2.6.19.1/drivers/char/Kconfig linux-mips-2.6.19.1/drivers/char/Kconfig 1955 --- linux-2.6.19.1/drivers/char/Kconfig 2006-12-11 11:32:53.000000000 -0800 1956 +++ linux-mips-2.6.19.1/drivers/char/Kconfig 2006-12-11 15:38:26.000000000 -0800 1693 1957 @@ -357,19 +357,56 @@ 1694 1958 To compile this driver as a module, choose M here: the … … 1760 2024 config A2232 1761 2025 tristate "Commodore A2232 serial support (EXPERIMENTAL)" 1762 diff -Naur linux-2.6.19 /drivers/char/Makefile linux-mips-2.6.19/drivers/char/Makefile1763 --- linux-2.6.19 /drivers/char/Makefile 2006-11-29 13:57:37.000000000 -08001764 +++ linux-mips-2.6.19 /drivers/char/Makefile 2006-11-29 15:23:09.000000000 -08002026 diff -Naur linux-2.6.19.1/drivers/char/Makefile linux-mips-2.6.19.1/drivers/char/Makefile 2027 --- linux-2.6.19.1/drivers/char/Makefile 2006-12-11 11:32:53.000000000 -0800 2028 +++ linux-mips-2.6.19.1/drivers/char/Makefile 2006-12-11 15:38:26.000000000 -0800 1765 2029 @@ -31,6 +31,7 @@ 1766 2030 obj-$(CONFIG_A2232) += ser_a2232.o generic_serial.o … … 1787 2051 obj-$(CONFIG_NWBUTTON) += nwbutton.o 1788 2052 obj-$(CONFIG_NWFLASH) += nwflash.o 1789 diff -Naur linux-2.6.19 /drivers/char/au1000_gpio.c linux-mips-2.6.19/drivers/char/au1000_gpio.c1790 --- linux-2.6.19 /drivers/char/au1000_gpio.c 1969-12-31 16:00:00.000000000 -08001791 +++ linux-mips-2.6.19 /drivers/char/au1000_gpio.c 2006-11-29 15:23:09.000000000 -08002053 diff -Naur linux-2.6.19.1/drivers/char/au1000_gpio.c linux-mips-2.6.19.1/drivers/char/au1000_gpio.c 2054 --- linux-2.6.19.1/drivers/char/au1000_gpio.c 1969-12-31 16:00:00.000000000 -0800 2055 +++ linux-mips-2.6.19.1/drivers/char/au1000_gpio.c 2006-12-11 15:38:26.000000000 -0800 1792 2056 @@ -0,0 +1,262 @@ 1793 2057 +/* … … 2053 2317 +module_init(au1000gpio_init); 2054 2318 +module_exit(au1000gpio_exit); 2055 diff -Naur linux-2.6.19 /drivers/char/au1000_ts.c linux-mips-2.6.19/drivers/char/au1000_ts.c2056 --- linux-2.6.19 /drivers/char/au1000_ts.c 1969-12-31 16:00:00.000000000 -08002057 +++ linux-mips-2.6.19 /drivers/char/au1000_ts.c 2006-11-29 15:23:09.000000000 -08002319 diff -Naur linux-2.6.19.1/drivers/char/au1000_ts.c linux-mips-2.6.19.1/drivers/char/au1000_ts.c 2320 --- linux-2.6.19.1/drivers/char/au1000_ts.c 1969-12-31 16:00:00.000000000 -0800 2321 +++ linux-mips-2.6.19.1/drivers/char/au1000_ts.c 2006-12-11 15:38:26.000000000 -0800 2058 2322 @@ -0,0 +1,677 @@ 2059 2323 +/* … … 2734 2998 +module_init(au1000ts_init_module); 2735 2999 +module_exit(au1000ts_cleanup_module); 2736 diff -Naur linux-2.6.19 /drivers/char/decserial.c linux-mips-2.6.19/drivers/char/decserial.c2737 --- linux-2.6.19 /drivers/char/decserial.c 2006-11-29 13:57:37.000000000 -08002738 +++ linux-mips-2.6.19 /drivers/char/decserial.c 2006-11-29 15:23:09.000000000 -08003000 diff -Naur linux-2.6.19.1/drivers/char/decserial.c linux-mips-2.6.19.1/drivers/char/decserial.c 3001 --- linux-2.6.19.1/drivers/char/decserial.c 2006-12-11 11:32:53.000000000 -0800 3002 +++ linux-mips-2.6.19.1/drivers/char/decserial.c 2006-12-11 15:38:26.000000000 -0800 2739 3003 @@ -14,86 +14,84 @@ 2740 3004 * device. Added support for PROM console in drivers/char/tty_io.c … … 2870 3134 2871 3135 #endif 2872 diff -Naur linux-2.6.19 /drivers/char/sb1250_duart.c linux-mips-2.6.19/drivers/char/sb1250_duart.c2873 --- linux-2.6.19 /drivers/char/sb1250_duart.c 1969-12-31 16:00:00.000000000 -08002874 +++ linux-mips-2.6.19 /drivers/char/sb1250_duart.c 2006-11-29 15:23:09.000000000 -08003136 diff -Naur linux-2.6.19.1/drivers/char/sb1250_duart.c linux-mips-2.6.19.1/drivers/char/sb1250_duart.c 3137 --- linux-2.6.19.1/drivers/char/sb1250_duart.c 1969-12-31 16:00:00.000000000 -0800 3138 +++ linux-mips-2.6.19.1/drivers/char/sb1250_duart.c 2006-12-11 15:38:26.000000000 -0800 2875 3139 @@ -0,0 +1,909 @@ 2876 3140 +/* … … 3783 4047 + 3784 4048 +#endif /* CONFIG_SIBYTE_SB1250_DUART_CONSOLE */ 3785 diff -Naur linux-2.6.19 /drivers/ide/mips/Makefile linux-mips-2.6.19/drivers/ide/mips/Makefile3786 --- linux-2.6.19 /drivers/ide/mips/Makefile 2006-11-29 13:57:37.000000000 -08003787 +++ linux-mips-2.6.19 /drivers/ide/mips/Makefile 2006-11-29 15:23:09.000000000 -08004049 diff -Naur linux-2.6.19.1/drivers/ide/mips/Makefile linux-mips-2.6.19.1/drivers/ide/mips/Makefile 4050 --- linux-2.6.19.1/drivers/ide/mips/Makefile 2006-12-11 11:32:53.000000000 -0800 4051 +++ linux-mips-2.6.19.1/drivers/ide/mips/Makefile 2006-12-11 15:38:26.000000000 -0800 3788 4052 @@ -1,4 +1,4 @@ 3789 4053 obj-$(CONFIG_BLK_DEV_IDE_SWARM) += swarm.o … … 3792 4056 -EXTRA_CFLAGS := -Idrivers/ide 3793 4057 +CFLAGS_au1xxx-ide.o := -Idrivers/ide 3794 diff -Naur linux-2.6.19/drivers/mtd/devices/docprobe.c linux-mips-2.6.19/drivers/mtd/devices/docprobe.c 3795 --- linux-2.6.19/drivers/mtd/devices/docprobe.c 2006-11-29 13:57:37.000000000 -0800 3796 +++ linux-mips-2.6.19/drivers/mtd/devices/docprobe.c 2006-11-29 15:23:09.000000000 -0800 4058 diff -Naur linux-2.6.19.1/drivers/isdn/hisax/Kconfig linux-mips-2.6.19.1/drivers/isdn/hisax/Kconfig 4059 --- linux-2.6.19.1/drivers/isdn/hisax/Kconfig 2006-12-11 11:32:53.000000000 -0800 4060 +++ linux-mips-2.6.19.1/drivers/isdn/hisax/Kconfig 2006-12-11 15:38:26.000000000 -0800 4061 @@ -110,7 +110,7 @@ 4062 4063 config HISAX_TELESPCI 4064 bool "Teles PCI" 4065 - depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || FRV)) 4066 + depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) 4067 help 4068 This enables HiSax support for the Teles PCI. 4069 See <file:Documentation/isdn/README.HiSax> on how to configure it. 4070 @@ -238,7 +238,7 @@ 4071 4072 config HISAX_NETJET 4073 bool "NETjet card" 4074 - depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || FRV)) 4075 + depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) 4076 help 4077 This enables HiSax support for the NetJet from Traverse 4078 Technologies. 4079 @@ -249,7 +249,7 @@ 4080 4081 config HISAX_NETJET_U 4082 bool "NETspider U card" 4083 - depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || FRV)) 4084 + depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) 4085 help 4086 This enables HiSax support for the Netspider U interface ISDN card 4087 from Traverse Technologies. 4088 @@ -317,7 +317,7 @@ 4089 4090 config HISAX_HFC_PCI 4091 bool "HFC PCI-Bus cards" 4092 - depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || FRV)) 4093 + depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) 4094 help 4095 This enables HiSax support for the HFC-S PCI 2BDS0 based cards. 4096 4097 @@ -344,7 +344,7 @@ 4098 4099 config HISAX_ENTERNOW_PCI 4100 bool "Formula-n enter:now PCI card" 4101 - depends on HISAX_NETJET && PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || FRV)) 4102 + depends on HISAX_NETJET && PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) 4103 help 4104 This enables HiSax support for the Formula-n enter:now PCI 4105 ISDN card. 4106 diff -Naur linux-2.6.19.1/drivers/mtd/devices/docprobe.c linux-mips-2.6.19.1/drivers/mtd/devices/docprobe.c 4107 --- linux-2.6.19.1/drivers/mtd/devices/docprobe.c 2006-12-11 11:32:53.000000000 -0800 4108 +++ linux-mips-2.6.19.1/drivers/mtd/devices/docprobe.c 2006-12-11 15:38:26.000000000 -0800 3797 4109 @@ -83,10 +83,10 @@ 3798 4110 0xe4000000, … … 3809 4121 #endif 3810 4122 0xffffffff }; 3811 diff -Naur linux-2.6.19 /drivers/mtd/maps/lasat.c linux-mips-2.6.19/drivers/mtd/maps/lasat.c3812 --- linux-2.6.19 /drivers/mtd/maps/lasat.c 2006-11-29 13:57:37.000000000 -08003813 +++ linux-mips-2.6.19 /drivers/mtd/maps/lasat.c 2006-11-29 15:23:09.000000000 -08004123 diff -Naur linux-2.6.19.1/drivers/mtd/maps/lasat.c linux-mips-2.6.19.1/drivers/mtd/maps/lasat.c 4124 --- linux-2.6.19.1/drivers/mtd/maps/lasat.c 2006-12-11 11:32:53.000000000 -0800 4125 +++ linux-mips-2.6.19.1/drivers/mtd/maps/lasat.c 2006-12-11 15:38:26.000000000 -0800 3814 4126 @@ -7,7 +7,7 @@ 3815 4127 * modify it under the terms of the GNU General Public License version … … 3830 4142 lasat_map.size = lasat_board_info.li_flash_size; 3831 4143 3832 diff -Naur linux-2.6.19 /drivers/net/Kconfig linux-mips-2.6.19/drivers/net/Kconfig3833 --- linux-2.6.19 /drivers/net/Kconfig 2006-11-29 13:57:37.000000000 -08003834 +++ linux-mips-2.6.19 /drivers/net/Kconfig 2006-11-29 15:23:09.000000000 -08004144 diff -Naur linux-2.6.19.1/drivers/net/Kconfig linux-mips-2.6.19.1/drivers/net/Kconfig 4145 --- linux-2.6.19.1/drivers/net/Kconfig 2006-12-11 11:32:53.000000000 -0800 4146 +++ linux-mips-2.6.19.1/drivers/net/Kconfig 2006-12-11 15:38:26.000000000 -0800 3835 4147 @@ -441,6 +441,14 @@ 3836 4148 This is the driver for the onboard card of MIPS Magnum 4000, … … 3934 4246 tristate "QLogic QLA3XXX Network Driver Support" 3935 4247 depends on PCI 3936 diff -Naur linux-2.6.19 /drivers/net/Makefile linux-mips-2.6.19/drivers/net/Makefile3937 --- linux-2.6.19 /drivers/net/Makefile 2006-11-29 13:57:37.000000000 -08003938 +++ linux-mips-2.6.19 /drivers/net/Makefile 2006-11-29 15:23:09.000000000 -08004248 diff -Naur linux-2.6.19.1/drivers/net/Makefile linux-mips-2.6.19.1/drivers/net/Makefile 4249 --- linux-2.6.19.1/drivers/net/Makefile 2006-12-11 11:32:53.000000000 -0800 4250 +++ linux-mips-2.6.19.1/drivers/net/Makefile 2006-12-11 15:38:26.000000000 -0800 3939 4251 @@ -112,6 +112,10 @@ 3940 4252 obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o … … 3948 4260 obj-$(CONFIG_PPP_ASYNC) += ppp_async.o 3949 4261 obj-$(CONFIG_PPP_SYNC_TTY) += ppp_synctty.o 3950 diff -Naur linux-2.6.19 /drivers/net/big_sur_ge.c linux-mips-2.6.19/drivers/net/big_sur_ge.c3951 --- linux-2.6.19 /drivers/net/big_sur_ge.c 1969-12-31 16:00:00.000000000 -08003952 +++ linux-mips-2.6.19 /drivers/net/big_sur_ge.c 2006-11-29 15:23:09.000000000 -08004262 diff -Naur linux-2.6.19.1/drivers/net/big_sur_ge.c linux-mips-2.6.19.1/drivers/net/big_sur_ge.c 4263 --- linux-2.6.19.1/drivers/net/big_sur_ge.c 1969-12-31 16:00:00.000000000 -0800 4264 +++ linux-mips-2.6.19.1/drivers/net/big_sur_ge.c 2006-12-11 15:38:26.000000000 -0800 3953 4265 @@ -0,0 +1,2004 @@ 3954 4266 +/* … … 5956 6268 +MODULE_DESCRIPTION("PMC-Sierra Big Sur Ethernet MAC Driver"); 5957 6269 +MODULE_LICENSE("GPL"); 5958 diff -Naur linux-2.6.19 /drivers/net/big_sur_ge.h linux-mips-2.6.19/drivers/net/big_sur_ge.h5959 --- linux-2.6.19 /drivers/net/big_sur_ge.h 1969-12-31 16:00:00.000000000 -08005960 +++ linux-mips-2.6.19 /drivers/net/big_sur_ge.h 2006-11-29 15:23:09.000000000 -08006270 diff -Naur linux-2.6.19.1/drivers/net/big_sur_ge.h linux-mips-2.6.19.1/drivers/net/big_sur_ge.h 6271 --- linux-2.6.19.1/drivers/net/big_sur_ge.h 1969-12-31 16:00:00.000000000 -0800 6272 +++ linux-mips-2.6.19.1/drivers/net/big_sur_ge.h 2006-12-11 15:38:26.000000000 -0800 5961 6273 @@ -0,0 +1,713 @@ 5962 6274 +/* … … 6673 6985 + 6674 6986 +#endif 6675 diff -Naur linux-2.6.19 /drivers/net/gt64240eth.c linux-mips-2.6.19/drivers/net/gt64240eth.c6676 --- linux-2.6.19 /drivers/net/gt64240eth.c 1969-12-31 16:00:00.000000000 -08006677 +++ linux-mips-2.6.19 /drivers/net/gt64240eth.c 2006-11-29 15:23:09.000000000 -08006987 diff -Naur linux-2.6.19.1/drivers/net/gt64240eth.c linux-mips-2.6.19.1/drivers/net/gt64240eth.c 6988 --- linux-2.6.19.1/drivers/net/gt64240eth.c 1969-12-31 16:00:00.000000000 -0800 6989 +++ linux-mips-2.6.19.1/drivers/net/gt64240eth.c 2006-12-11 15:38:26.000000000 -0800 6678 6990 @@ -0,0 +1,1671 @@ 6679 6991 +/* … … 8348 8660 + return &gp->stats; 8349 8661 +} 8350 diff -Naur linux-2.6.19 /drivers/net/gt64240eth.h linux-mips-2.6.19/drivers/net/gt64240eth.h8351 --- linux-2.6.19 /drivers/net/gt64240eth.h 1969-12-31 16:00:00.000000000 -08008352 +++ linux-mips-2.6.19 /drivers/net/gt64240eth.h 2006-11-29 15:23:09.000000000 -08008662 diff -Naur linux-2.6.19.1/drivers/net/gt64240eth.h linux-mips-2.6.19.1/drivers/net/gt64240eth.h 8663 --- linux-2.6.19.1/drivers/net/gt64240eth.h 1969-12-31 16:00:00.000000000 -0800 8664 +++ linux-mips-2.6.19.1/drivers/net/gt64240eth.h 2006-12-11 15:38:26.000000000 -0800 8353 8665 @@ -0,0 +1,403 @@ 8354 8666 +/* … … 8755 9067 + 8756 9068 +#endif /* _GT64240ETH_H */ 8757 diff -Naur linux-2.6.19 /drivers/net/ioc3-eth.c linux-mips-2.6.19/drivers/net/ioc3-eth.c8758 --- linux-2.6.19 /drivers/net/ioc3-eth.c 2006-11-29 13:57:37.000000000 -08008759 +++ linux-mips-2.6.19 /drivers/net/ioc3-eth.c 2006-11-29 15:23:09.000000000 -08009069 diff -Naur linux-2.6.19.1/drivers/net/ioc3-eth.c linux-mips-2.6.19.1/drivers/net/ioc3-eth.c 9070 --- linux-2.6.19.1/drivers/net/ioc3-eth.c 2006-12-11 11:32:53.000000000 -0800 9071 +++ linux-mips-2.6.19.1/drivers/net/ioc3-eth.c 2006-12-11 15:38:26.000000000 -0800 8760 9072 @@ -5,7 +5,7 @@ 8761 9073 * … … 8884 9196 8885 9197 static int ioc3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 8886 diff -Naur linux-2.6.19 /drivers/net/titan_ge.c linux-mips-2.6.19/drivers/net/titan_ge.c8887 --- linux-2.6.19 /drivers/net/titan_ge.c 1969-12-31 16:00:00.000000000 -08008888 +++ linux-mips-2.6.19 /drivers/net/titan_ge.c 2006-11-29 15:23:09.000000000 -08009198 diff -Naur linux-2.6.19.1/drivers/net/titan_ge.c linux-mips-2.6.19.1/drivers/net/titan_ge.c 9199 --- linux-2.6.19.1/drivers/net/titan_ge.c 1969-12-31 16:00:00.000000000 -0800 9200 +++ linux-mips-2.6.19.1/drivers/net/titan_ge.c 2006-12-11 15:38:26.000000000 -0800 8889 9201 @@ -0,0 +1,2069 @@ 8890 9202 +/* … … 10957 11269 +module_init(titan_ge_init_module); 10958 11270 +module_exit(titan_ge_cleanup_module); 10959 diff -Naur linux-2.6.19 /drivers/net/titan_ge.h linux-mips-2.6.19/drivers/net/titan_ge.h10960 --- linux-2.6.19 /drivers/net/titan_ge.h 1969-12-31 16:00:00.000000000 -080010961 +++ linux-mips-2.6.19 /drivers/net/titan_ge.h 2006-11-29 15:23:09.000000000 -080011271 diff -Naur linux-2.6.19.1/drivers/net/titan_ge.h linux-mips-2.6.19.1/drivers/net/titan_ge.h 11272 --- linux-2.6.19.1/drivers/net/titan_ge.h 1969-12-31 16:00:00.000000000 -0800 11273 +++ linux-mips-2.6.19.1/drivers/net/titan_ge.h 2006-12-11 15:38:26.000000000 -0800 10962 11274 @@ -0,0 +1,415 @@ 10963 11275 +#ifndef _TITAN_GE_H_ … … 11376 11688 +#endif /* _TITAN_GE_H_ */ 11377 11689 + 11378 diff -Naur linux-2.6.19 /drivers/net/titan_mdio.c linux-mips-2.6.19/drivers/net/titan_mdio.c11379 --- linux-2.6.19 /drivers/net/titan_mdio.c 1969-12-31 16:00:00.000000000 -080011380 +++ linux-mips-2.6.19 /drivers/net/titan_mdio.c 2006-11-29 15:23:09.000000000 -080011690 diff -Naur linux-2.6.19.1/drivers/net/titan_mdio.c linux-mips-2.6.19.1/drivers/net/titan_mdio.c 11691 --- linux-2.6.19.1/drivers/net/titan_mdio.c 1969-12-31 16:00:00.000000000 -0800 11692 +++ linux-mips-2.6.19.1/drivers/net/titan_mdio.c 2006-12-11 15:38:26.000000000 -0800 11381 11693 @@ -0,0 +1,217 @@ 11382 11694 +/* … … 11597 11909 +} 11598 11910 + 11599 diff -Naur linux-2.6.19 /drivers/net/titan_mdio.h linux-mips-2.6.19/drivers/net/titan_mdio.h11600 --- linux-2.6.19 /drivers/net/titan_mdio.h 1969-12-31 16:00:00.000000000 -080011601 +++ linux-mips-2.6.19 /drivers/net/titan_mdio.h 2006-11-29 15:23:09.000000000 -080011911 diff -Naur linux-2.6.19.1/drivers/net/titan_mdio.h linux-mips-2.6.19.1/drivers/net/titan_mdio.h 11912 --- linux-2.6.19.1/drivers/net/titan_mdio.h 1969-12-31 16:00:00.000000000 -0800 11913 +++ linux-mips-2.6.19.1/drivers/net/titan_mdio.h 2006-12-11 15:38:26.000000000 -0800 11602 11914 @@ -0,0 +1,56 @@ 11603 11915 +/* … … 11657 11969 + 11658 11970 +#endif /* _TITAN_MDIO_H */ 11659 diff -Naur linux-2.6.19 /drivers/scsi/NCR53C9x.h linux-mips-2.6.19/drivers/scsi/NCR53C9x.h11660 --- linux-2.6.19 /drivers/scsi/NCR53C9x.h 2006-11-29 13:57:37.000000000 -080011661 +++ linux-mips-2.6.19 /drivers/scsi/NCR53C9x.h 2006-11-29 15:23:09.000000000 -080011971 diff -Naur linux-2.6.19.1/drivers/scsi/NCR53C9x.h linux-mips-2.6.19.1/drivers/scsi/NCR53C9x.h 11972 --- linux-2.6.19.1/drivers/scsi/NCR53C9x.h 2006-12-11 11:32:53.000000000 -0800 11973 +++ linux-mips-2.6.19.1/drivers/scsi/NCR53C9x.h 2006-12-11 15:38:26.000000000 -0800 11662 11974 @@ -144,12 +144,7 @@ 11663 11975 … … 11674 11986 11675 11987 struct ESP_regs { 11676 diff -Naur linux-2.6.19 /drivers/scsi/dec_esp.c linux-mips-2.6.19/drivers/scsi/dec_esp.c11677 --- linux-2.6.19 /drivers/scsi/dec_esp.c 2006-11-29 13:57:37.000000000 -080011678 +++ linux-mips-2.6.19 /drivers/scsi/dec_esp.c 2006-11-29 15:23:09.000000000 -080011988 diff -Naur linux-2.6.19.1/drivers/scsi/dec_esp.c linux-mips-2.6.19.1/drivers/scsi/dec_esp.c 11989 --- linux-2.6.19.1/drivers/scsi/dec_esp.c 2006-12-11 11:32:53.000000000 -0800 11990 +++ linux-mips-2.6.19.1/drivers/scsi/dec_esp.c 2006-12-11 15:38:26.000000000 -0800 11679 11991 @@ -55,7 +55,7 @@ 11680 11992 … … 11695 12007 esp->dregs = 0; 11696 12008 esp->eregs = (void *)CKSEG1ADDR(mem_start + 11697 diff -Naur linux-2.6.19 /drivers/scsi/sgiwd93.c linux-mips-2.6.19/drivers/scsi/sgiwd93.c11698 --- linux-2.6.19 /drivers/scsi/sgiwd93.c 2006-11-29 13:57:37.000000000 -080011699 +++ linux-mips-2.6.19 /drivers/scsi/sgiwd93.c 2006-11-29 15:23:09.000000000 -080012009 diff -Naur linux-2.6.19.1/drivers/scsi/sgiwd93.c linux-mips-2.6.19.1/drivers/scsi/sgiwd93.c 12010 --- linux-2.6.19.1/drivers/scsi/sgiwd93.c 2006-12-11 11:32:53.000000000 -0800 12011 +++ linux-mips-2.6.19.1/drivers/scsi/sgiwd93.c 2006-12-11 15:38:26.000000000 -0800 11700 12012 @@ -14,6 +14,7 @@ 11701 12013 #include <linux/interrupt.h> … … 11714 12026 static inline void init_hpc_chain(struct hpc_data *hd) 11715 12027 { 11716 diff -Naur linux-2.6.19 /drivers/serial/Kconfig linux-mips-2.6.19/drivers/serial/Kconfig11717 --- linux-2.6.19 /drivers/serial/Kconfig 2006-11-29 13:57:37.000000000 -080011718 +++ linux-mips-2.6.19 /drivers/serial/Kconfig 2006-11-29 15:23:09.000000000 -080012028 diff -Naur linux-2.6.19.1/drivers/serial/Kconfig linux-mips-2.6.19.1/drivers/serial/Kconfig 12029 --- linux-2.6.19.1/drivers/serial/Kconfig 2006-12-11 11:32:53.000000000 -0800 12030 +++ linux-mips-2.6.19.1/drivers/serial/Kconfig 2006-12-11 15:38:26.000000000 -0800 11719 12031 @@ -657,6 +657,25 @@ 11720 12032 depends on SERIAL_SH_SCI=y … … 11743 12055 tristate 11744 12056 11745 diff -Naur linux-2.6.19 /drivers/serial/Makefile linux-mips-2.6.19/drivers/serial/Makefile11746 --- linux-2.6.19 /drivers/serial/Makefile 2006-11-29 13:57:37.000000000 -080011747 +++ linux-mips-2.6.19 /drivers/serial/Makefile 2006-11-29 15:23:09.000000000 -080012057 diff -Naur linux-2.6.19.1/drivers/serial/Makefile linux-mips-2.6.19.1/drivers/serial/Makefile 12058 --- linux-2.6.19.1/drivers/serial/Makefile 2006-12-11 11:32:53.000000000 -0800 12059 +++ linux-mips-2.6.19.1/drivers/serial/Makefile 2006-12-11 15:38:26.000000000 -0800 11748 12060 @@ -39,6 +39,7 @@ 11749 12061 obj-$(CONFIG_V850E_UART) += v850e_uart.o … … 11754 12066 obj-$(CONFIG_SERIAL_SH_SCI) += sh-sci.o 11755 12067 obj-$(CONFIG_SERIAL_SGI_L1_CONSOLE) += sn_console.o 11756 diff -Naur linux-2.6.19 /drivers/serial/ip22zilog.c linux-mips-2.6.19/drivers/serial/ip22zilog.c11757 --- linux-2.6.19 /drivers/serial/ip22zilog.c 2006-11-29 13:57:37.000000000 -080011758 +++ linux-mips-2.6.19 /drivers/serial/ip22zilog.c 2006-11-29 15:23:09.000000000 -080012068 diff -Naur linux-2.6.19.1/drivers/serial/ip22zilog.c linux-mips-2.6.19.1/drivers/serial/ip22zilog.c 12069 --- linux-2.6.19.1/drivers/serial/ip22zilog.c 2006-12-11 11:32:53.000000000 -0800 12070 +++ linux-mips-2.6.19.1/drivers/serial/ip22zilog.c 2006-12-11 15:38:26.000000000 -0800 11759 12071 @@ -863,6 +863,7 @@ 11760 12072 up->cflag = termios->c_cflag; … … 11774 12086 11775 12087 static int __init ip22zilog_console_setup(struct console *con, char *options) 11776 diff -Naur linux-2.6.19 /drivers/serial/ip3106_uart.c linux-mips-2.6.19/drivers/serial/ip3106_uart.c11777 --- linux-2.6.19 /drivers/serial/ip3106_uart.c 1969-12-31 16:00:00.000000000 -080011778 +++ linux-mips-2.6.19 /drivers/serial/ip3106_uart.c 2006-11-29 15:23:09.000000000 -080012088 diff -Naur linux-2.6.19.1/drivers/serial/ip3106_uart.c linux-mips-2.6.19.1/drivers/serial/ip3106_uart.c 12089 --- linux-2.6.19.1/drivers/serial/ip3106_uart.c 1969-12-31 16:00:00.000000000 -0800 12090 +++ linux-mips-2.6.19.1/drivers/serial/ip3106_uart.c 2006-12-11 15:38:26.000000000 -0800 11779 12091 @@ -0,0 +1,909 @@ 11780 12092 +/* … … 12687 12999 +MODULE_LICENSE("GPL"); 12688 13000 +MODULE_ALIAS_CHARDEV_MAJOR(SERIAL_IP3106_MAJOR); 12689 diff -Naur linux-2.6.19 /drivers/usb/host/ohci-hcd.c linux-mips-2.6.19/drivers/usb/host/ohci-hcd.c12690 --- linux-2.6.19 /drivers/usb/host/ohci-hcd.c 2006-11-29 13:57:37.000000000 -080012691 +++ linux-mips-2.6.19 /drivers/usb/host/ohci-hcd.c 2006-11-29 15:23:09.000000000 -080013001 diff -Naur linux-2.6.19.1/drivers/usb/host/ohci-hcd.c linux-mips-2.6.19.1/drivers/usb/host/ohci-hcd.c 13002 --- linux-2.6.19.1/drivers/usb/host/ohci-hcd.c 2006-12-11 11:32:53.000000000 -0800 13003 +++ linux-mips-2.6.19.1/drivers/usb/host/ohci-hcd.c 2006-12-11 15:38:26.000000000 -0800 12692 13004 @@ -931,6 +931,10 @@ 12693 13005 #include "ohci-au1xxx.c" … … 12701 13013 #include "ohci-ppc-soc.c" 12702 13014 #endif 12703 diff -Naur linux-2.6.19 /drivers/usb/host/ohci-pnx8550.c linux-mips-2.6.19/drivers/usb/host/ohci-pnx8550.c12704 --- linux-2.6.19 /drivers/usb/host/ohci-pnx8550.c 1969-12-31 16:00:00.000000000 -080012705 +++ linux-mips-2.6.19 /drivers/usb/host/ohci-pnx8550.c 2006-11-29 15:23:09.000000000 -080013015 diff -Naur linux-2.6.19.1/drivers/usb/host/ohci-pnx8550.c linux-mips-2.6.19.1/drivers/usb/host/ohci-pnx8550.c 13016 --- linux-2.6.19.1/drivers/usb/host/ohci-pnx8550.c 1969-12-31 16:00:00.000000000 -0800 13017 +++ linux-mips-2.6.19.1/drivers/usb/host/ohci-pnx8550.c 2006-12-11 15:38:26.000000000 -0800 12706 13018 @@ -0,0 +1,277 @@ 12707 13019 +/* … … 12982 13294 +module_init (ohci_hcd_pnx8550_init); 12983 13295 +module_exit (ohci_hcd_pnx8550_cleanup); 12984 diff -Naur linux-2.6.19 /drivers/video/Kconfig linux-mips-2.6.19/drivers/video/Kconfig12985 --- linux-2.6.19 /drivers/video/Kconfig 2006-11-29 13:57:37.000000000 -080012986 +++ linux-mips-2.6.19 /drivers/video/Kconfig 2006-11-29 15:23:09.000000000 -080013296 diff -Naur linux-2.6.19.1/drivers/video/Kconfig linux-mips-2.6.19.1/drivers/video/Kconfig 13297 --- linux-2.6.19.1/drivers/video/Kconfig 2006-12-11 11:32:53.000000000 -0800 13298 +++ linux-mips-2.6.19.1/drivers/video/Kconfig 2006-12-11 15:38:26.000000000 -0800 12987 13299 @@ -1277,6 +1277,17 @@ 12988 13300 Please read the <file:Documentation/fb/README-sstfb.txt> for supported … … 13041 13353 config FB_MAXINE 13042 13354 bool "Maxine (Personal DECstation) onboard framebuffer support" 13043 diff -Naur linux-2.6.19 /drivers/video/Makefile linux-mips-2.6.19/drivers/video/Makefile13044 --- linux-2.6.19 /drivers/video/Makefile 2006-11-29 13:57:37.000000000 -080013045 +++ linux-mips-2.6.19 /drivers/video/Makefile 2006-11-29 15:23:09.000000000 -080013355 diff -Naur linux-2.6.19.1/drivers/video/Makefile linux-mips-2.6.19.1/drivers/video/Makefile 13356 --- linux-2.6.19.1/drivers/video/Makefile 2006-12-11 11:32:53.000000000 -0800 13357 +++ linux-mips-2.6.19.1/drivers/video/Makefile 2006-12-11 15:38:26.000000000 -0800 13046 13358 @@ -96,6 +96,7 @@ 13047 13359 obj-$(CONFIG_FB_TX3912) += tx3912fb.o … … 13052 13364 obj-$(CONFIG_FB_PNX4008_DUM) += pnx4008/ 13053 13365 obj-$(CONFIG_FB_PNX4008_DUM_RGB) += pnx4008/ 13054 diff -Naur linux-2.6.19 /drivers/video/au1100fb.c linux-mips-2.6.19/drivers/video/au1100fb.c13055 --- linux-2.6.19 /drivers/video/au1100fb.c 2006-11-29 13:57:37.000000000 -080013056 +++ linux-mips-2.6.19 /drivers/video/au1100fb.c 2006-11-29 15:23:09.000000000 -080013366 diff -Naur linux-2.6.19.1/drivers/video/au1100fb.c linux-mips-2.6.19.1/drivers/video/au1100fb.c 13367 --- linux-2.6.19.1/drivers/video/au1100fb.c 2006-12-11 11:32:53.000000000 -0800 13368 +++ linux-mips-2.6.19.1/drivers/video/au1100fb.c 2006-12-11 15:38:26.000000000 -0800 13057 13369 @@ -41,6 +41,7 @@ 13058 13370 * with this program; if not, write to the Free Software Foundation, Inc., … … 13063 13375 #include <linux/kernel.h> 13064 13376 #include <linux/errno.h> 13065 diff -Naur linux-2.6.19 /drivers/video/smivgxfb.c linux-mips-2.6.19/drivers/video/smivgxfb.c13066 --- linux-2.6.19 /drivers/video/smivgxfb.c 1969-12-31 16:00:00.000000000 -080013067 +++ linux-mips-2.6.19 /drivers/video/smivgxfb.c 2006-11-29 15:23:09.000000000 -080013377 diff -Naur linux-2.6.19.1/drivers/video/smivgxfb.c linux-mips-2.6.19.1/drivers/video/smivgxfb.c 13378 --- linux-2.6.19.1/drivers/video/smivgxfb.c 1969-12-31 16:00:00.000000000 -0800 13379 +++ linux-mips-2.6.19.1/drivers/video/smivgxfb.c 2006-12-11 15:38:26.000000000 -0800 13068 13380 @@ -0,0 +1,387 @@ 13069 13381 +/*************************************************************************** … … 13454 13766 +MODULE_DESCRIPTION("Framebuffer driver for SMI Voyager"); 13455 13767 +MODULE_LICENSE("GPL"); 13456 diff -Naur linux-2.6.19/include/asm-mips/compat.h linux-mips-2.6.19/include/asm-mips/compat.h 13457 --- linux-2.6.19/include/asm-mips/compat.h 2006-11-29 13:57:37.000000000 -0800 13458 +++ linux-mips-2.6.19/include/asm-mips/compat.h 2006-11-29 15:23:09.000000000 -0800 13459 @@ -32,6 +32,7 @@ 13768 diff -Naur linux-2.6.19.1/include/asm-mips/compat.h linux-mips-2.6.19.1/include/asm-mips/compat.h 13769 --- linux-2.6.19.1/include/asm-mips/compat.h 2006-12-11 11:32:53.000000000 -0800 13770 +++ linux-mips-2.6.19.1/include/asm-mips/compat.h 2006-12-11 15:38:26.000000000 -0800 13771 @@ -5,6 +5,7 @@ 13772 */ 13773 #include <linux/types.h> 13774 #include <asm/page.h> 13775 +#include <asm/ptrace.h> 13776 13777 #define COMPAT_USER_HZ 100 13778 13779 @@ -32,6 +33,7 @@ 13460 13780 s32 val[2]; 13461 13781 } compat_fsid_t; … … 13465 13785 typedef s32 compat_int_t; 13466 13786 typedef s32 compat_long_t; 13467 @@ -146,4 +14 7,71 @@13787 @@ -146,4 +148,71 @@ 13468 13788 return (void __user *) (regs->regs[29] - len); 13469 13789 } … … 13537 13857 + 13538 13858 #endif /* _ASM_COMPAT_H */ 13539 diff -Naur linux-2.6.19 /include/asm-mips/io.h linux-mips-2.6.19/include/asm-mips/io.h13540 --- linux-2.6.19 /include/asm-mips/io.h 2006-11-29 13:57:37.000000000 -080013541 +++ linux-mips-2.6.19 /include/asm-mips/io.h 2006-11-29 15:23:09.000000000 -080013859 diff -Naur linux-2.6.19.1/include/asm-mips/io.h linux-mips-2.6.19.1/include/asm-mips/io.h 13860 --- linux-2.6.19.1/include/asm-mips/io.h 2006-12-11 11:32:53.000000000 -0800 13861 +++ linux-mips-2.6.19.1/include/asm-mips/io.h 2006-12-11 15:38:26.000000000 -0800 13542 13862 @@ -518,34 +518,6 @@ 13543 13863 } … … 13575 13895 * to explicitly ioremap() it. The fact that the ISA IO space is mapped 13576 13896 * to PAGE_OFFSET is pure coincidence - it does not mean ISA values 13577 diff -Naur linux-2.6.19 /include/asm-mips/mach-au1x00/au1000.h linux-mips-2.6.19/include/asm-mips/mach-au1x00/au1000.h13578 --- linux-2.6.19 /include/asm-mips/mach-au1x00/au1000.h 2006-11-29 13:57:37.000000000 -080013579 +++ linux-mips-2.6.19 /include/asm-mips/mach-au1x00/au1000.h 2006-11-29 15:23:09.000000000 -080013897 diff -Naur linux-2.6.19.1/include/asm-mips/mach-au1x00/au1000.h linux-mips-2.6.19.1/include/asm-mips/mach-au1x00/au1000.h 13898 --- linux-2.6.19.1/include/asm-mips/mach-au1x00/au1000.h 2006-12-11 11:32:53.000000000 -0800 13899 +++ linux-mips-2.6.19.1/include/asm-mips/mach-au1x00/au1000.h 2006-12-11 15:38:26.000000000 -0800 13580 13900 @@ -39,6 +39,7 @@ 13581 13901 #ifndef _LANGUAGE_ASSEMBLY … … 13605 13925 #define PCI_IO_START (Au1500_PCI_IO_START + 0x1000) 13606 13926 #define PCI_IO_END (Au1500_PCI_IO_END) 13607 diff -Naur linux-2.6.19 /include/asm-mips/mach-au1x00/au1xxx_ide.h linux-mips-2.6.19/include/asm-mips/mach-au1x00/au1xxx_ide.h13608 --- linux-2.6.19 /include/asm-mips/mach-au1x00/au1xxx_ide.h 2006-11-29 13:57:37.000000000 -080013609 +++ linux-mips-2.6.19 /include/asm-mips/mach-au1x00/au1xxx_ide.h 2006-11-29 15:23:09.000000000 -080013927 diff -Naur linux-2.6.19.1/include/asm-mips/mach-au1x00/au1xxx_ide.h linux-mips-2.6.19.1/include/asm-mips/mach-au1x00/au1xxx_ide.h 13928 --- linux-2.6.19.1/include/asm-mips/mach-au1x00/au1xxx_ide.h 2006-12-11 11:32:53.000000000 -0800 13929 +++ linux-mips-2.6.19.1/include/asm-mips/mach-au1x00/au1xxx_ide.h 2006-12-11 15:38:26.000000000 -0800 13610 13930 @@ -83,6 +83,7 @@ 13611 13931 } _auide_hwif; … … 13616 13936 static const struct drive_list_entry dma_white_list [] = { 13617 13937 /* 13618 diff -Naur linux-2.6.19/include/asm-mips/page.h linux-mips-2.6.19/include/asm-mips/page.h 13619 --- linux-2.6.19/include/asm-mips/page.h 2006-11-29 13:57:37.000000000 -0800 13620 +++ linux-mips-2.6.19/include/asm-mips/page.h 2006-11-29 15:23:09.000000000 -0800 13938 diff -Naur linux-2.6.19.1/include/asm-mips/mach-ip27/irq.h linux-mips-2.6.19.1/include/asm-mips/mach-ip27/irq.h 13939 --- linux-2.6.19.1/include/asm-mips/mach-ip27/irq.h 2006-12-11 11:32:53.000000000 -0800 13940 +++ linux-mips-2.6.19.1/include/asm-mips/mach-ip27/irq.h 2006-12-11 15:38:26.000000000 -0800 13941 @@ -10,8 +10,6 @@ 13942 #ifndef __ASM_MACH_IP27_IRQ_H 13943 #define __ASM_MACH_IP27_IRQ_H 13944 13945 -#include <asm/sn/arch.h> 13946 - 13947 /* 13948 * A hardwired interrupt number is completly stupid for this system - a 13949 * large configuration might have thousands if not tenthousands of 13950 diff -Naur linux-2.6.19.1/include/asm-mips/mach-ip27/topology.h linux-mips-2.6.19.1/include/asm-mips/mach-ip27/topology.h 13951 --- linux-2.6.19.1/include/asm-mips/mach-ip27/topology.h 2006-12-11 11:32:53.000000000 -0800 13952 +++ linux-mips-2.6.19.1/include/asm-mips/mach-ip27/topology.h 2006-12-11 15:38:26.000000000 -0800 13953 @@ -1,7 +1,6 @@ 13954 #ifndef _ASM_MACH_TOPOLOGY_H 13955 #define _ASM_MACH_TOPOLOGY_H 1 13956 13957 -#include <asm/sn/arch.h> 13958 #include <asm/sn/hub.h> 13959 #include <asm/mmzone.h> 13960 13961 diff -Naur linux-2.6.19.1/include/asm-mips/page.h linux-mips-2.6.19.1/include/asm-mips/page.h 13962 --- linux-2.6.19.1/include/asm-mips/page.h 2006-12-11 11:32:53.000000000 -0800 13963 +++ linux-mips-2.6.19.1/include/asm-mips/page.h 2006-12-11 15:38:26.000000000 -0800 13621 13964 @@ -59,16 +59,13 @@ 13622 13965 flush_data_cache_page((unsigned long)addr); … … 13643 13986 /* 13644 13987 * These are used to make use of C type-checking.. 13645 diff -Naur linux-2.6.19/include/linux/highmem.h linux-mips-2.6.19/include/linux/highmem.h 13646 --- linux-2.6.19/include/linux/highmem.h 2006-11-29 13:57:37.000000000 -0800 13647 +++ linux-mips-2.6.19/include/linux/highmem.h 2006-11-29 15:23:09.000000000 -0800 13988 diff -Naur linux-2.6.19.1/include/asm-mips/pci.h linux-mips-2.6.19.1/include/asm-mips/pci.h 13989 --- linux-2.6.19.1/include/asm-mips/pci.h 2006-12-11 11:32:53.000000000 -0800 13990 +++ linux-mips-2.6.19.1/include/asm-mips/pci.h 2006-12-11 15:38:26.000000000 -0800 13991 @@ -187,4 +187,10 @@ 13992 /* Do platform specific device initialization at pci_enable_device() time */ 13993 extern int pcibios_plat_dev_init(struct pci_dev *dev); 13994 13995 +/* Chances are this interrupt is wired PC-style ... */ 13996 +static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) 13997 +{ 13998 + return channel ? 15 : 14; 13999 +} 14000 + 14001 #endif /* _ASM_PCI_H */ 14002 diff -Naur linux-2.6.19.1/include/asm-mips/ptrace.h linux-mips-2.6.19.1/include/asm-mips/ptrace.h 14003 --- linux-2.6.19.1/include/asm-mips/ptrace.h 2006-12-11 11:32:53.000000000 -0800 14004 +++ linux-mips-2.6.19.1/include/asm-mips/ptrace.h 2006-12-11 15:38:26.000000000 -0800 14005 @@ -84,6 +84,14 @@ 14006 14007 extern asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit); 14008 14009 +extern NORET_TYPE void die(const char *, struct pt_regs *); 14010 + 14011 +static inline void die_if_kernel(const char *str, struct pt_regs *regs) 14012 +{ 14013 + if (unlikely(!user_mode(regs))) 14014 + die(str, regs); 14015 +} 14016 + 14017 #endif 14018 14019 #endif /* _ASM_PTRACE_H */ 14020 diff -Naur linux-2.6.19.1/include/asm-mips/sn/arch.h linux-mips-2.6.19.1/include/asm-mips/sn/arch.h 14021 --- linux-2.6.19.1/include/asm-mips/sn/arch.h 2006-12-11 11:32:53.000000000 -0800 14022 +++ linux-mips-2.6.19.1/include/asm-mips/sn/arch.h 2006-12-11 15:38:26.000000000 -0800 14023 @@ -18,7 +18,6 @@ 14024 #endif 14025 14026 typedef u64 hubreg_t; 14027 -typedef u64 nic_t; 14028 14029 #define cputonasid(cpu) (cpu_data[(cpu)].p_nasid) 14030 #define cputoslice(cpu) (cpu_data[(cpu)].p_slice) 14031 diff -Naur linux-2.6.19.1/include/asm-mips/sn/klconfig.h linux-mips-2.6.19.1/include/asm-mips/sn/klconfig.h 14032 --- linux-2.6.19.1/include/asm-mips/sn/klconfig.h 2006-12-11 11:32:53.000000000 -0800 14033 +++ linux-mips-2.6.19.1/include/asm-mips/sn/klconfig.h 2006-12-11 15:38:26.000000000 -0800 14034 @@ -61,6 +61,8 @@ 14035 #endif /* CONFIG_SGI_IP35 */ 14036 #endif /* CONFIG_SGI_IP27 || CONFIG_SGI_IP35 */ 14037 14038 +typedef u64 nic_t; 14039 + 14040 #define KLCFGINFO_MAGIC 0xbeedbabe 14041 14042 typedef s32 klconf_off_t; 14043 @@ -176,7 +178,7 @@ 14044 /* --- New Macros for the changed kl_config_hdr_t structure --- */ 14045 14046 #define PTR_CH_MALLOC_HDR(_k) ((klc_malloc_hdr_t *)\ 14047 - (unsigned long)_k + (_k->ch_malloc_hdr_off))) 14048 + ((unsigned long)_k + (_k->ch_malloc_hdr_off))) 14049 14050 #define KL_CONFIG_CH_MALLOC_HDR(_n) PTR_CH_MALLOC_HDR(KL_CONFIG_HDR(_n)) 14051 14052 diff -Naur linux-2.6.19.1/include/asm-mips/system.h linux-mips-2.6.19.1/include/asm-mips/system.h 14053 --- linux-2.6.19.1/include/asm-mips/system.h 2006-12-11 11:32:53.000000000 -0800 14054 +++ linux-mips-2.6.19.1/include/asm-mips/system.h 2006-12-11 15:38:26.000000000 -0800 14055 @@ -18,7 +18,6 @@ 14056 #include <asm/addrspace.h> 14057 #include <asm/cpu-features.h> 14058 #include <asm/dsp.h> 14059 -#include <asm/ptrace.h> 14060 #include <asm/war.h> 14061 14062 /* 14063 @@ -472,14 +471,6 @@ 14064 extern unsigned long ebase; 14065 extern void per_cpu_trap_init(void); 14066 14067 -extern NORET_TYPE void die(const char *, struct pt_regs *); 14068 - 14069 -static inline void die_if_kernel(const char *str, struct pt_regs *regs) 14070 -{ 14071 - if (unlikely(!user_mode(regs))) 14072 - die(str, regs); 14073 -} 14074 - 14075 extern int stop_a_enabled; 14076 14077 /* 14078 diff -Naur linux-2.6.19.1/include/linux/highmem.h linux-mips-2.6.19.1/include/linux/highmem.h 14079 --- linux-2.6.19.1/include/linux/highmem.h 2006-12-11 11:32:53.000000000 -0800 14080 +++ linux-mips-2.6.19.1/include/linux/highmem.h 2006-12-11 15:38:26.000000000 -0800 13648 14081 @@ -94,7 +94,10 @@ 13649 14082 kunmap_atomic(kaddr, KM_USER0); … … 13667 14100 { 13668 14101 char *vfrom, *vto; 13669 diff -Naur linux-2.6.19 /include/linux/pci_ids.h linux-mips-2.6.19/include/linux/pci_ids.h13670 --- linux-2.6.19 /include/linux/pci_ids.h 2006-11-29 13:57:37.000000000 -080013671 +++ linux-mips-2.6.19 /include/linux/pci_ids.h 2006-11-29 15:23:09.000000000 -080014102 diff -Naur linux-2.6.19.1/include/linux/pci_ids.h linux-mips-2.6.19.1/include/linux/pci_ids.h 14103 --- linux-2.6.19.1/include/linux/pci_ids.h 2006-12-11 11:32:53.000000000 -0800 14104 +++ linux-mips-2.6.19.1/include/linux/pci_ids.h 2006-12-11 15:38:26.000000000 -0800 13672 14105 @@ -1604,6 +1604,9 @@ 13673 14106 #define PCI_VENDOR_ID_SATSAGEM 0x1267 … … 13680 14113 #define PCI_VENDOR_ID_ENSONIQ 0x1274 13681 14114 #define PCI_DEVICE_ID_ENSONIQ_CT5880 0x5880 13682 diff -Naur linux-2.6.19 /include/linux/serial.h linux-mips-2.6.19/include/linux/serial.h13683 --- linux-2.6.19 /include/linux/serial.h 2006-11-29 13:57:37.000000000 -080013684 +++ linux-mips-2.6.19 /include/linux/serial.h 2006-11-29 15:23:09.000000000 -080014115 diff -Naur linux-2.6.19.1/include/linux/serial.h linux-mips-2.6.19.1/include/linux/serial.h 14116 --- linux-2.6.19.1/include/linux/serial.h 2006-12-11 11:32:53.000000000 -0800 14117 +++ linux-mips-2.6.19.1/include/linux/serial.h 2006-12-11 15:38:26.000000000 -0800 13685 14118 @@ -76,7 +76,8 @@ 13686 14119 #define PORT_16654 11 … … 13693 14126 #define SERIAL_IO_PORT 0 13694 14127 #define SERIAL_IO_HUB6 1 13695 diff -Naur linux-2.6.19 /include/linux/serial_ip3106.h linux-mips-2.6.19/include/linux/serial_ip3106.h13696 --- linux-2.6.19 /include/linux/serial_ip3106.h 2006-11-29 13:57:37.000000000 -080013697 +++ linux-mips-2.6.19 /include/linux/serial_ip3106.h 2006-11-29 15:23:09.000000000 -080014128 diff -Naur linux-2.6.19.1/include/linux/serial_ip3106.h linux-mips-2.6.19.1/include/linux/serial_ip3106.h 14129 --- linux-2.6.19.1/include/linux/serial_ip3106.h 2006-12-11 11:32:53.000000000 -0800 14130 +++ linux-mips-2.6.19.1/include/linux/serial_ip3106.h 2006-12-11 15:38:26.000000000 -0800 13698 14131 @@ -78,4 +78,16 @@ 13699 14132 #define IP3106_UART_FIFO_RXFIFO 0x00001F00 … … 13713 14146 + 13714 14147 #endif 13715 diff -Naur linux-2.6.19 /mm/memory.c linux-mips-2.6.19/mm/memory.c13716 --- linux-2.6.19 /mm/memory.c 2006-11-29 13:57:37.000000000 -080013717 +++ linux-mips-2.6.19 /mm/memory.c 2006-11-29 15:23:09.000000000 -080014148 diff -Naur linux-2.6.19.1/mm/memory.c linux-mips-2.6.19.1/mm/memory.c 14149 --- linux-2.6.19.1/mm/memory.c 2006-12-11 11:32:53.000000000 -0800 14150 +++ linux-mips-2.6.19.1/mm/memory.c 2006-12-11 15:38:26.000000000 -0800 13718 14151 @@ -1431,7 +1431,7 @@ 13719 14152 return pte; … … 13755 14188 new_page = page; 13756 14189 anon = 1; 13757 diff -Naur linux-2.6.19 /sound/oss/Kconfig linux-mips-2.6.19/sound/oss/Kconfig13758 --- linux-2.6.19 /sound/oss/Kconfig 2006-11-29 13:57:37.000000000 -080013759 +++ linux-mips-2.6.19 /sound/oss/Kconfig 2006-11-29 15:23:09.000000000 -080014190 diff -Naur linux-2.6.19.1/sound/oss/Kconfig linux-mips-2.6.19.1/sound/oss/Kconfig 14191 --- linux-2.6.19.1/sound/oss/Kconfig 2006-12-11 11:32:53.000000000 -0800 14192 +++ linux-mips-2.6.19.1/sound/oss/Kconfig 2006-12-11 15:38:26.000000000 -0800 13760 14193 @@ -128,6 +128,13 @@ 13761 14194 select SND_AC97_CODEC … … 13772 14205 tristate "Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core" 13773 14206 depends on SOUND_PRIME && PCI 13774 diff -Naur linux-2.6.19 /sound/oss/Makefile linux-mips-2.6.19/sound/oss/Makefile13775 --- linux-2.6.19 /sound/oss/Makefile 2006-11-29 13:57:37.000000000 -080013776 +++ linux-mips-2.6.19 /sound/oss/Makefile 2006-11-29 15:23:09.000000000 -080014207 diff -Naur linux-2.6.19.1/sound/oss/Makefile linux-mips-2.6.19.1/sound/oss/Makefile 14208 --- linux-2.6.19.1/sound/oss/Makefile 2006-12-11 11:32:53.000000000 -0800 14209 +++ linux-mips-2.6.19.1/sound/oss/Makefile 2006-12-11 15:38:26.000000000 -0800 13777 14210 @@ -45,6 +45,7 @@ 13778 14211 obj-$(CONFIG_SOUND_ES1371) += es1371.o ac97_codec.o … … 13783 14216 obj-$(CONFIG_SOUND_TRIDENT) += trident.o ac97_codec.o 13784 14217 obj-$(CONFIG_SOUND_EMU10K1) += ac97_codec.o 13785 diff -Naur linux-2.6.19 /sound/oss/au1550_i2s.c linux-mips-2.6.19/sound/oss/au1550_i2s.c13786 --- linux-2.6.19 /sound/oss/au1550_i2s.c 1969-12-31 16:00:00.000000000 -080013787 +++ linux-mips-2.6.19 /sound/oss/au1550_i2s.c 2006-11-29 15:23:09.000000000 -080014218 diff -Naur linux-2.6.19.1/sound/oss/au1550_i2s.c linux-mips-2.6.19.1/sound/oss/au1550_i2s.c 14219 --- linux-2.6.19.1/sound/oss/au1550_i2s.c 1969-12-31 16:00:00.000000000 -0800 14220 +++ linux-mips-2.6.19.1/sound/oss/au1550_i2s.c 2006-12-11 15:38:26.000000000 -0800 13788 14221 @@ -0,0 +1,2029 @@ 13789 14222 +/*
Note:
See TracChangeset
for help on using the changeset viewer.