diff options
Diffstat (limited to 'packages')
32 files changed, 4198 insertions, 867 deletions
diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot index 2c106efa73..3bffc2bec5 100644 --- a/packages/altboot/files/init.altboot +++ b/packages/altboot/files/init.altboot @@ -178,7 +178,8 @@ run_timer() { 2.4*) key_ints="`cat /proc/interrupts | grep keyboard | awk '{print $2}'`";; 2.6*) key_ints="`cat /proc/interrupts | grep Spitzkbd`" test -z "$key_ints" && key_ints="`cat /proc/interrupts | grep -i corgikbd`" - test -z "$key_ints" && key_ints="`cat /proc/interrupts | grep -i locomokbd`";; + test -z "$key_ints" && key_ints="`cat /proc/interrupts | grep -i locomokbd`" + test -z "$key_ints" && key_ints="`cat /proc/interrupts | grep -i tosakbd`";; esac test -z "$key_ints" && debug_echo "Couldn't read keyboard ints!" @@ -196,7 +197,8 @@ run_timer() { 2.4*) key_ints_now="`cat /proc/interrupts | grep keyboard | awk '{print $2}'`";; 2.6*) key_ints_now="`cat /proc/interrupts | grep Spitzkbd`" test -z "$key_ints_now" && key_ints_now="`cat /proc/interrupts | grep -i corgikbd`" - test -z "$key_ints_now" && key_ints_now="`cat /proc/interrupts | grep -i locomokbd`";; + test -z "$key_ints_now" && key_ints_now="`cat /proc/interrupts | grep -i locomokbd`" + test -z "$key_ints_now" && key_ints_now="`cat /proc/interrupts | grep -i tosakbd`";; esac if test "$key_ints_now" != "$key_ints" -o -z "$key_ints_now" diff --git a/packages/binutils/binutils-2.17/.mtn2git_empty b/packages/binutils/binutils-2.17/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/binutils/binutils-2.17/.mtn2git_empty diff --git a/packages/binutils/binutils-2.17/100-uclibc-conf.patch b/packages/binutils/binutils-2.17/100-uclibc-conf.patch new file mode 100644 index 0000000000..25222e5df2 --- /dev/null +++ b/packages/binutils/binutils-2.17/100-uclibc-conf.patch @@ -0,0 +1,139 @@ +--- binutils-2.16.91.0.7/bfd/configure ++++ binutils-2.16.91.0.7/bfd/configure +@@ -3576,7 +3576,7 @@ + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-gnu*|linux-uclibc*) + lt_cv_deplibs_check_method=pass_all + ;; + +--- binutils-2.16.91.0.7/binutils/configure ++++ binutils-2.16.91.0.7/binutils/configure +@@ -3411,7 +3411,7 @@ + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-gnu*|linux-uclibc*) + lt_cv_deplibs_check_method=pass_all + ;; + +--- binutils-2.16.91.0.7/configure ++++ binutils-2.16.91.0.7/configure +@@ -1270,7 +1270,7 @@ + am33_2.0-*-linux*) + noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" + ;; +- sh-*-linux*) ++ sh*-*-linux*) + noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" + ;; + sh*-*-pe|mips*-*-pe|*arm-wince-pe) +@@ -1578,7 +1578,7 @@ + romp-*-*) + noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}" + ;; +- sh-*-* | sh64-*-*) ++ sh*-*-* | sh64-*-*) + case "${host}" in + i[3456789]86-*-vsta) ;; # don't add gprof back in + i[3456789]86-*-go32*) ;; # don't add gprof back in +--- binutils-2.16.91.0.7/configure.in ++++ binutils-2.16.91.0.7/configure.in +@@ -468,7 +468,7 @@ + am33_2.0-*-linux*) + noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" + ;; +- sh-*-linux*) ++ sh*-*-linux*) + noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss" + ;; + sh*-*-pe|mips*-*-pe|*arm-wince-pe) +@@ -776,7 +776,7 @@ + romp-*-*) + noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}" + ;; +- sh-*-* | sh64-*-*) ++ sh*-*-* | sh64-*-*) + case "${host}" in + i[[3456789]]86-*-vsta) ;; # don't add gprof back in + i[[3456789]]86-*-go32*) ;; # don't add gprof back in +--- binutils-2.16.91.0.7/gas/configure ++++ binutils-2.16.91.0.7/gas/configure +@@ -3411,7 +3411,7 @@ + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-gnu*|linux-uclibc*) + lt_cv_deplibs_check_method=pass_all + ;; + +--- binutils-2.16.91.0.7/gprof/configure ++++ binutils-2.16.91.0.7/gprof/configure +@@ -3419,6 +3419,11 @@ + lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` + ;; + ++linux-uclibc*) ++ lt_cv_deplibs_check_method=pass_all ++ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so` ++ ;; ++ + netbsd* | knetbsd*-gnu) + if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then + lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' +--- binutils-2.16.91.0.7/ld/configure ++++ binutils-2.16.91.0.7/ld/configure +@@ -3413,7 +3413,7 @@ + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-gnu*|linux-uclibc*) + lt_cv_deplibs_check_method=pass_all + ;; + +--- binutils-2.16.91.0.7/libtool.m4 ++++ binutils-2.16.91.0.7/libtool.m4 +@@ -739,7 +739,7 @@ + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-gnu*|linux-uclibc*) + lt_cv_deplibs_check_method=pass_all + ;; + +--- binutils-2.16.91.0.7/ltconfig ++++ binutils-2.16.91.0.7/ltconfig +@@ -602,6 +602,7 @@ + + # Transform linux* to *-*-linux-gnu*, to support old configure scripts. + case $host_os in ++linux-uclibc*) ;; + linux-gnu*) ;; + linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` + esac +@@ -1247,7 +1248,7 @@ + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-gnu*|linux-uclibc*) + version_type=linux + need_lib_prefix=no + need_version=no +--- binutils-2.16.91.0.7/opcodes/configure ++++ binutils-2.16.91.0.7/opcodes/configure +@@ -3579,7 +3579,7 @@ + ;; + + # This must be Linux ELF. +-linux-gnu*) ++linux-gnu*|linux-uclibc*) + lt_cv_deplibs_check_method=pass_all + ;; + diff --git a/packages/binutils/binutils-2.17/110-arm-eabi-conf.patch b/packages/binutils/binutils-2.17/110-arm-eabi-conf.patch new file mode 100644 index 0000000000..be85ceb109 --- /dev/null +++ b/packages/binutils/binutils-2.17/110-arm-eabi-conf.patch @@ -0,0 +1,24 @@ +diff -urN binutils-2.16.91.0.7.orig/configure binutils-2.16.91.0.7/configure +--- binutils-2.16.91.0.7.orig/configure 2006-05-31 14:54:24.000000000 +0300 ++++ binutils-2.16.91.0.7/configure 2006-05-31 14:55:53.000000000 +0300 +@@ -1299,7 +1299,7 @@ + arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* ) + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + ;; +- arm*-*-linux-gnueabi) ++ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi) + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + noconfigdirs="$noconfigdirs target-libjava target-libobjc" + ;; +diff -urN binutils-2.16.91.0.7.orig/configure.in binutils-2.16.91.0.7/configure.in +--- binutils-2.16.91.0.7.orig/configure.in 2006-05-31 14:54:24.000000000 +0300 ++++ binutils-2.16.91.0.7/configure.in 2006-05-31 14:55:53.000000000 +0300 +@@ -497,7 +497,7 @@ + arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* ) + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + ;; +- arm*-*-linux-gnueabi) ++ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi) + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + noconfigdirs="$noconfigdirs target-libjava target-libobjc" + ;; diff --git a/packages/binutils/binutils-2.17/300-001_ld_makefile_patch.patch b/packages/binutils/binutils-2.17/300-001_ld_makefile_patch.patch new file mode 100644 index 0000000000..04a7e61e25 --- /dev/null +++ b/packages/binutils/binutils-2.17/300-001_ld_makefile_patch.patch @@ -0,0 +1,50 @@ +#!/bin/sh -e +## 001_ld_makefile_patch.dpatch +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Description: correct where ld scripts are installed +## DP: Author: Chris Chimelis <chris@debian.org> +## DP: Upstream status: N/A +## DP: Date: ?? + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +--- binutils-2.16.91.0.1/ld/Makefile.am ++++ binutils-2.16.91.0.1/ld/Makefile.am +@@ -20,7 +20,7 @@ + # We put the scripts in the directory $(scriptdir)/ldscripts. + # We can't put the scripts in $(datadir) because the SEARCH_DIR + # directives need to be different for native and cross linkers. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + + EMUL = @EMUL@ + EMULATION_OFILES = @EMULATION_OFILES@ +--- binutils-2.16.91.0.1/ld/Makefile.in ++++ binutils-2.16.91.0.1/ld/Makefile.in +@@ -268,7 +268,7 @@ + # We put the scripts in the directory $(scriptdir)/ldscripts. + # We can't put the scripts in $(datadir) because the SEARCH_DIR + # directives need to be different for native and cross linkers. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + BASEDIR = $(srcdir)/.. + BFDDIR = $(BASEDIR)/bfd + INCDIR = $(BASEDIR)/include diff --git a/packages/binutils/binutils-2.17/300-006_better_file_error.patch b/packages/binutils/binutils-2.17/300-006_better_file_error.patch new file mode 100644 index 0000000000..f337611edf --- /dev/null +++ b/packages/binutils/binutils-2.17/300-006_better_file_error.patch @@ -0,0 +1,43 @@ +#!/bin/sh -e +## 006_better_file_error.dpatch by David Kimdon <dwhedon@gordian.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Specify which filename is causing an error if the filename is a +## DP: directory. (#45832) + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c binutils-2.14.90.0.6/bfd/opncls.c +--- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c 2003-07-23 16:08:09.000000000 +0100 ++++ binutils-2.14.90.0.6/bfd/opncls.c 2003-09-10 22:35:00.000000000 +0100 +@@ -150,6 +150,13 @@ + { + bfd *nbfd; + const bfd_target *target_vec; ++ struct stat s; ++ ++ if (stat (filename, &s) == 0) ++ if (S_ISDIR(s.st_mode)) { ++ bfd_set_error (bfd_error_file_not_recognized); ++ return NULL; ++ } + + nbfd = _bfd_new_bfd (); + if (nbfd == NULL) diff --git a/packages/binutils/binutils-2.17/300-012_check_ldrunpath_length.patch b/packages/binutils/binutils-2.17/300-012_check_ldrunpath_length.patch new file mode 100644 index 0000000000..498651a90c --- /dev/null +++ b/packages/binutils/binutils-2.17/300-012_check_ldrunpath_length.patch @@ -0,0 +1,47 @@ +#!/bin/sh -e +## 012_check_ldrunpath_length.dpatch by Chris Chimelis <chris@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for +## DP: cases where -rpath isn't specified. (#151024) + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em binutils-2.15/ld/emultempl/elf32.em +--- /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:58.000000000 +0100 ++++ binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:59.000000000 +0100 +@@ -692,6 +692,8 @@ + && command_line.rpath == NULL) + { + lib_path = (const char *) getenv ("LD_RUN_PATH"); ++ if ((lib_path) && (strlen (lib_path) == 0)) ++ lib_path = NULL; + if (gld${EMULATION_NAME}_search_needed (lib_path, &n, + force)) + break; +@@ -871,6 +873,8 @@ + rpath = command_line.rpath; + if (rpath == NULL) + rpath = (const char *) getenv ("LD_RUN_PATH"); ++ if ((rpath) && (strlen (rpath) == 0)) ++ rpath = NULL; + if (! (bfd_elf_size_dynamic_sections + (output_bfd, command_line.soname, rpath, + command_line.filter_shlib, diff --git a/packages/binutils/binutils-2.17/400-mips-ELF_MAXPAGESIZE-4K.patch b/packages/binutils/binutils-2.17/400-mips-ELF_MAXPAGESIZE-4K.patch new file mode 100644 index 0000000000..5959c718d2 --- /dev/null +++ b/packages/binutils/binutils-2.17/400-mips-ELF_MAXPAGESIZE-4K.patch @@ -0,0 +1,26 @@ +--- binutils/bfd/elf32-mips.c~ ++++ binutils/bfd/elf32-mips.c +@@ -1613,7 +1613,9 @@ + + /* The SVR4 MIPS ABI says that this should be 0x10000, and Linux uses + page sizes of up to that limit, so we need to respect it. */ +-#define ELF_MAXPAGESIZE 0x10000 ++/*#define ELF_MAXPAGESIZE 0x10000*/ ++/* Use 4K to shrink the elf header. NOT for general use! */ ++#define ELF_MAXPAGESIZE 0x1000 + #define elf32_bed elf32_tradbed + + /* Include the target file again for this target. */ +--- binutils/bfd/elfn32-mips.c~ ++++ binutils/bfd/elfn32-mips.c +@@ -2399,7 +2399,9 @@ + + /* The SVR4 MIPS ABI says that this should be 0x10000, and Linux uses + page sizes of up to that limit, so we need to respect it. */ +-#define ELF_MAXPAGESIZE 0x10000 ++/*#define ELF_MAXPAGESIZE 0x10000*/ ++/* Use 4K to shrink the elf header. NOT for general use! */ ++#define ELF_MAXPAGESIZE 0x1000 + #define elf32_bed elf32_tradbed + + /* Include the target file again for this target. */ diff --git a/packages/binutils/binutils-2.17/702-binutils-skip-comments.patch b/packages/binutils/binutils-2.17/702-binutils-skip-comments.patch new file mode 100644 index 0000000000..9ef7a7c9ec --- /dev/null +++ b/packages/binutils/binutils-2.17/702-binutils-skip-comments.patch @@ -0,0 +1,93 @@ +Retrieved from http://sources.redhat.com/ml/binutils/2004-04/msg00646.html +Fixes +localealias.s:544: Error: junk at end of line, first unrecognized character is `,' +when building glibc-2.3.2 with gcc-3.4.0 and binutils-2.15.90.0.3 + +Paths adjusted to match crosstool's patcher. + +Message-Id: m3n052qw2g.fsf@whitebox.m5r.de +From: Andreas Schwab <schwab at suse dot de> +To: Nathan Sidwell <nathan at codesourcery dot com> +Cc: Ian Lance Taylor <ian at wasabisystems dot com>, binutils at sources dot redhat dot com +Date: Fri, 23 Apr 2004 22:27:19 +0200 +Subject: Re: demand_empty_rest_of_line and ignore_rest_of_line + +Nathan Sidwell <nathan@codesourcery.com> writes: + +> Index: read.c +> =================================================================== +> RCS file: /cvs/src/src/gas/read.c,v +> retrieving revision 1.76 +> diff -c -3 -p -r1.76 read.c +> *** read.c 12 Mar 2004 17:48:12 -0000 1.76 +> --- read.c 18 Mar 2004 09:56:05 -0000 +> *************** read_a_source_file (char *name) +> *** 1053,1059 **** +> #endif +> input_line_pointer--; +> /* Report unknown char as ignored. */ +> ! ignore_rest_of_line (); +> } +> +> #ifdef md_after_pass_hook +> --- 1053,1059 ---- +> #endif +> input_line_pointer--; +> /* Report unknown char as ignored. */ +> ! demand_empty_rest_of_line (); +> } +> +> #ifdef md_after_pass_hook + +This means that the unknown character is no longer ignored, despite the +comment. As a side effect a line starting with a line comment character +not followed by APP in NO_APP mode now triggers an error instead of just a +warning, breaking builds of glibc on m68k-linux. Earlier in +read_a_source_file where #APP is handled there is another comment that +claims that unknown comments are ignored, when in fact they aren't (only +the initial line comment character is skipped). + +Note that the presence of #APP will mess up the line counters, but +that appears to be difficult to fix. + +Andreas. + +2004-04-23 Andreas Schwab <schwab@suse.de> + + * read.c (read_a_source_file): Ignore unknown text after line + comment character. Fix misleading comment. + +--- binutils/gas/read.c.~1.78.~ 2004-04-23 08:58:23.000000000 +0200 ++++ binutils/gas/read.c 2004-04-23 21:49:01.000000000 +0200 +@@ -950,10 +950,14 @@ read_a_source_file (char *name) + unsigned int new_length; + char *tmp_buf = 0; + +- bump_line_counters (); + s = input_line_pointer; + if (strncmp (s, "APP\n", 4)) +- continue; /* We ignore it */ ++ { ++ /* We ignore it */ ++ ignore_rest_of_line (); ++ continue; ++ } ++ bump_line_counters (); + s += 4; + + sb_new (&sbuf); +@@ -1052,7 +1056,7 @@ read_a_source_file (char *name) + continue; + #endif + input_line_pointer--; +- /* Report unknown char as ignored. */ ++ /* Report unknown char as error. */ + demand_empty_rest_of_line (); + } + + +-- +Andreas Schwab, SuSE Labs, schwab@suse.de +SuSE Linux AG, MaxfeldstraÃe 5, 90409 NÃrnberg, Germany +Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 +"And now for something completely different." diff --git a/packages/binutils/binutils-cross_2.17.bb b/packages/binutils/binutils-cross_2.17.bb new file mode 100644 index 0000000000..df0f17b1ef --- /dev/null +++ b/packages/binutils/binutils-cross_2.17.bb @@ -0,0 +1,3 @@ +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}" +include binutils_${PV}.bb +include binutils-cross.inc diff --git a/packages/binutils/binutils_2.17.bb b/packages/binutils/binutils_2.17.bb new file mode 100644 index 0000000000..52b5ade90e --- /dev/null +++ b/packages/binutils/binutils_2.17.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "A GNU collection of binary utilities" +HOMEPAGE = "http://www.gnu.org/software/binutils/" +SECTION = "devel" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = \ + "http://ftp.gnu.org/gnu/binutils/binutils-${PV}.tar.bz2 \ + file://better_file_error.patch;patch=1 \ + file://signed_char_fix.patch;patch=1 \ +" + +#patches from http://svn.uclibc.org/cgi-bin/viewcvs.cgi/trunk/buildroot/toolchain/binutils/2.17/ + +SRC_URI += "\ + file://100-uclibc-conf.patch;patch=1 \ + file://300-006_better_file_error.patch;patch=1 \ + file://702-binutils-skip-comments.patch;patch=1 \ + file://110-arm-eabi-conf.patch;patch=1 \ + file://300-012_check_ldrunpath_length.patch;patch=1 \ + file://300-001_ld_makefile_patch.patch;patch=1 \ + file://400-mips-ELF_MAXPAGESIZE-4K.patch;patch=1 \ +" + + +S = "${WORKDIR}/binutils-${PV}" +B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" + +include binutils.inc diff --git a/packages/busybox/busybox-1.2.0/angstrom/defconfig b/packages/busybox/busybox-1.2.0/angstrom/defconfig index d7f95af2cf..981b7d7c71 100644 --- a/packages/busybox/busybox-1.2.0/angstrom/defconfig +++ b/packages/busybox/busybox-1.2.0/angstrom/defconfig @@ -36,8 +36,8 @@ CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" # CONFIG_FEATURE_FULL_LIBBUSYBOX is not set # CONFIG_FEATURE_SHARED_BUSYBOX is not set CONFIG_LFS=y -# USING_CROSS_COMPILER is not set -CROSS_COMPILER_PREFIX="" +USING_CROSS_COMPILER=y +CROSS_COMPILER_PREFIX="arm-angstrom-linux-gnueabi-" CONFIG_BUILD_AT_ONCE=y # @@ -486,17 +486,17 @@ CONFIG_FEATURE_IPV6=y # CONFIG_FTPPUT is not set # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set CONFIG_HOSTNAME=y -CONFIG_HTTPD=y -CONFIG_FEATURE_HTTPD_WITHOUT_INETD=y -CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP=y +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set +# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set # CONFIG_FEATURE_HTTPD_SETUID is not set -CONFIG_FEATURE_HTTPD_BASIC_AUTH=y -CONFIG_FEATURE_HTTPD_AUTH_MD5=y -CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES=y -CONFIG_FEATURE_HTTPD_CGI=y -CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y -CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y -CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set CONFIG_IFCONFIG=y CONFIG_FEATURE_IFCONFIG_STATUS=y # CONFIG_FEATURE_IFCONFIG_SLIP is not set diff --git a/packages/busybox/busybox_1.2.0.bb b/packages/busybox/busybox_1.2.0.bb index f386304d90..29c6924b9d 100644 --- a/packages/busybox/busybox_1.2.0.bb +++ b/packages/busybox/busybox_1.2.0.bb @@ -10,6 +10,7 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" +PR = "r1" DEFAULT_PREFERENCE = "-1" @@ -58,7 +59,14 @@ INITSCRIPT_PARAMS_${PN}_openslug = "start 20 ." inherit cml1 update-rc.d do_configure () { - install -m 0644 ${WORKDIR}/defconfig ${S}/.config + install -m 0644 ${WORKDIR}/defconfig ${S}/.config.oe + + echo "CROSS_COMPILER_PREFIX=\"${TARGET_PREFIX}\"" > ${S}/.config + echo "USING_CROSS_COMPILER=y" >> ${S}/.config + + sed -e '/CROSS_COMPILER_PREFIX/d' \ + -e '/USING_CROSS_COMPILER/d' \ + '${S}/.config.oe' >>'${S}/.config' cml1_do_configure } diff --git a/packages/gnome/libgnomecups_0.2.2.bb b/packages/gnome/libgnomecups_0.2.2.bb index 4fcefb6454..86214904c8 100644 --- a/packages/gnome/libgnomecups_0.2.2.bb +++ b/packages/gnome/libgnomecups_0.2.2.bb @@ -2,7 +2,7 @@ DESCRIPTION="Gnome Cups Manager" LICENSE="GPLv2" PR="r0" -DEPENDS="glib-2.0 gtk+ pango cups" +DEPENDS="glib-2.0 gtk+ pango cups intltool" inherit gnome pkgconfig diff --git a/packages/linux/linux-jlime-sh3-2.6.17/LinuxSH-2.6.17.patch b/packages/linux/linux-jlime-sh3-2.6.17/LinuxSH-2.6.17.patch index a61f563976..8f2e611eca 100644 --- a/packages/linux/linux-jlime-sh3-2.6.17/LinuxSH-2.6.17.patch +++ b/packages/linux/linux-jlime-sh3-2.6.17/LinuxSH-2.6.17.patch @@ -1,6 +1,6 @@ diff -ruN linux-2.6.17-vanilla/CVS/Entries linux-2.6.17/CVS/Entries --- linux-2.6.17-vanilla/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/CVS/Entries 2006-07-06 12:42:53.000000000 +0000 ++++ linux-2.6.17/CVS/Entries 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1,21 @@ +/.cvsignore/1.1/Wed May 12 13:52:16 2004/-ko/ +/ChangeLog-1999/1.1.1.1/Mon Oct 15 20:44:29 2001// @@ -25,7 +25,7 @@ diff -ruN linux-2.6.17-vanilla/CVS/Entries linux-2.6.17/CVS/Entries +/localversion-sh/1.1/Wed Jul 5 07:22:47 2006/-ko/ diff -ruN linux-2.6.17-vanilla/CVS/Entries.Log linux-2.6.17/CVS/Entries.Log --- linux-2.6.17-vanilla/CVS/Entries.Log 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/CVS/Entries.Log 2006-07-06 12:42:53.000000000 +0000 ++++ linux-2.6.17/CVS/Entries.Log 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1,6 @@ +A D/fs//// +A D/init//// @@ -35,17 +35,17 @@ diff -ruN linux-2.6.17-vanilla/CVS/Entries.Log linux-2.6.17/CVS/Entries.Log +R D/fs//// diff -ruN linux-2.6.17-vanilla/CVS/Repository linux-2.6.17/CVS/Repository --- linux-2.6.17-vanilla/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/CVS/Repository 2006-07-06 12:42:53.000000000 +0000 ++++ linux-2.6.17/CVS/Repository 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1 @@ +linux diff -ruN linux-2.6.17-vanilla/CVS/Root linux-2.6.17/CVS/Root --- linux-2.6.17-vanilla/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/CVS/Root 2006-07-06 12:42:53.000000000 +0000 ++++ linux-2.6.17/CVS/Root 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/ChangeLog linux-2.6.17/ChangeLog --- linux-2.6.17-vanilla/ChangeLog 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/ChangeLog 2006-07-06 12:42:53.000000000 +0000 ++++ linux-2.6.17/ChangeLog 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1,19 @@ +2006-06-05 Adrian McMenamin <adrian@mcmen.demon.co.uk> + @@ -68,7 +68,7 @@ diff -ruN linux-2.6.17-vanilla/ChangeLog linux-2.6.17/ChangeLog + * sound/sh/Makefile: New file required to add AICA sound support diff -ruN linux-2.6.17-vanilla/ChangeLog-1999 linux-2.6.17/ChangeLog-1999 --- linux-2.6.17-vanilla/ChangeLog-1999 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/ChangeLog-1999 2006-07-06 12:42:53.000000000 +0000 ++++ linux-2.6.17/ChangeLog-1999 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1,902 @@ +1999-12-23 NIIBE Yutaka <gniibe@m17n.org> + @@ -974,7 +974,7 @@ diff -ruN linux-2.6.17-vanilla/ChangeLog-1999 linux-2.6.17/ChangeLog-1999 + 1999-08-18 diff -ruN linux-2.6.17-vanilla/ChangeLog-2000 linux-2.6.17/ChangeLog-2000 --- linux-2.6.17-vanilla/ChangeLog-2000 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/ChangeLog-2000 2006-07-06 12:42:53.000000000 +0000 ++++ linux-2.6.17/ChangeLog-2000 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1,2069 @@ +2000-12-28 Mitch Davis <mdavis@pocketpenguins.com> + @@ -3047,7 +3047,7 @@ diff -ruN linux-2.6.17-vanilla/ChangeLog-2000 linux-2.6.17/ChangeLog-2000 +End: diff -ruN linux-2.6.17-vanilla/ChangeLog-2001 linux-2.6.17/ChangeLog-2001 --- linux-2.6.17-vanilla/ChangeLog-2001 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/ChangeLog-2001 2006-07-06 12:42:53.000000000 +0000 ++++ linux-2.6.17/ChangeLog-2001 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1,1827 @@ +2001-12-28 NIIBE Yutaka <gniibe@m17n.org> + @@ -4878,7 +4878,7 @@ diff -ruN linux-2.6.17-vanilla/ChangeLog-2001 linux-2.6.17/ChangeLog-2001 +End: diff -ruN linux-2.6.17-vanilla/ChangeLog-2002 linux-2.6.17/ChangeLog-2002 --- linux-2.6.17-vanilla/ChangeLog-2002 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/ChangeLog-2002 2006-07-06 12:42:53.000000000 +0000 ++++ linux-2.6.17/ChangeLog-2002 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1,1750 @@ +2002-12-21 Paul Mundt <lethal@linux-sh.org> + @@ -6632,7 +6632,7 @@ diff -ruN linux-2.6.17-vanilla/ChangeLog-2002 linux-2.6.17/ChangeLog-2002 +End: diff -ruN linux-2.6.17-vanilla/ChangeLog-2003 linux-2.6.17/ChangeLog-2003 --- linux-2.6.17-vanilla/ChangeLog-2003 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/ChangeLog-2003 2006-07-06 12:42:53.000000000 +0000 ++++ linux-2.6.17/ChangeLog-2003 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1,1409 @@ +2003-12-18 Paul Mundt <lethal@linux-sh.org> + @@ -8045,7 +8045,7 @@ diff -ruN linux-2.6.17-vanilla/ChangeLog-2003 linux-2.6.17/ChangeLog-2003 + diff -ruN linux-2.6.17-vanilla/ChangeLog-2004 linux-2.6.17/ChangeLog-2004 --- linux-2.6.17-vanilla/ChangeLog-2004 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/ChangeLog-2004 2006-07-06 12:42:53.000000000 +0000 ++++ linux-2.6.17/ChangeLog-2004 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1,930 @@ +2004-12-03 Tom Rini <trini@kernel.crashing.org> + @@ -8979,7 +8979,7 @@ diff -ruN linux-2.6.17-vanilla/ChangeLog-2004 linux-2.6.17/ChangeLog-2004 + diff -ruN linux-2.6.17-vanilla/ChangeLog-2005 linux-2.6.17/ChangeLog-2005 --- linux-2.6.17-vanilla/ChangeLog-2005 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/ChangeLog-2005 2006-07-06 12:42:53.000000000 +0000 ++++ linux-2.6.17/ChangeLog-2005 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1,162 @@ +2005-10-31 Andriy Skulysh <askulysh@image.kiev.ua> + @@ -9145,22 +9145,22 @@ diff -ruN linux-2.6.17-vanilla/ChangeLog-2005 linux-2.6.17/ChangeLog-2005 + Initial testing done by Tom Rini on SE7750. diff -ruN linux-2.6.17-vanilla/Documentation/CVS/Entries linux-2.6.17/Documentation/CVS/Entries --- linux-2.6.17-vanilla/Documentation/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/Documentation/CVS/Entries 2006-07-06 12:42:53.000000000 +0000 ++++ linux-2.6.17/Documentation/CVS/Entries 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1 @@ +D/sh//// diff -ruN linux-2.6.17-vanilla/Documentation/CVS/Repository linux-2.6.17/Documentation/CVS/Repository --- linux-2.6.17-vanilla/Documentation/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/Documentation/CVS/Repository 2006-07-06 12:42:53.000000000 +0000 ++++ linux-2.6.17/Documentation/CVS/Repository 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1 @@ +linux/Documentation diff -ruN linux-2.6.17-vanilla/Documentation/CVS/Root linux-2.6.17/Documentation/CVS/Root --- linux-2.6.17-vanilla/Documentation/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/Documentation/CVS/Root 2006-07-06 12:42:53.000000000 +0000 ++++ linux-2.6.17/Documentation/CVS/Root 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/Documentation/sh/CVS/Entries linux-2.6.17/Documentation/sh/CVS/Entries --- linux-2.6.17-vanilla/Documentation/sh/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/Documentation/sh/CVS/Entries 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/Documentation/sh/CVS/Entries 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1,4 @@ +/kgdb.txt/1.2/Fri Nov 1 17:19:12 2002// +/new-machine.txt/1.6/Sun Jan 15 17:32:05 2006// @@ -9168,17 +9168,17 @@ diff -ruN linux-2.6.17-vanilla/Documentation/sh/CVS/Entries linux-2.6.17/Documen +D diff -ruN linux-2.6.17-vanilla/Documentation/sh/CVS/Repository linux-2.6.17/Documentation/sh/CVS/Repository --- linux-2.6.17-vanilla/Documentation/sh/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/Documentation/sh/CVS/Repository 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/Documentation/sh/CVS/Repository 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1 @@ +linux/Documentation/sh diff -ruN linux-2.6.17-vanilla/Documentation/sh/CVS/Root linux-2.6.17/Documentation/sh/CVS/Root --- linux-2.6.17-vanilla/Documentation/sh/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/Documentation/sh/CVS/Root 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/Documentation/sh/CVS/Root 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/Documentation/sh/new-machine.txt linux-2.6.17/Documentation/sh/new-machine.txt --- linux-2.6.17-vanilla/Documentation/sh/new-machine.txt 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/Documentation/sh/new-machine.txt 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/Documentation/sh/new-machine.txt 2006-07-07 10:17:06.000000000 +0000 @@ -41,11 +41,6 @@ | .. more boards here ... @@ -9348,7 +9348,7 @@ diff -ruN linux-2.6.17-vanilla/Documentation/sh/new-machine.txt linux-2.6.17/Doc - diff -ruN linux-2.6.17-vanilla/Documentation/sh/register-banks.txt linux-2.6.17/Documentation/sh/register-banks.txt --- linux-2.6.17-vanilla/Documentation/sh/register-banks.txt 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/Documentation/sh/register-banks.txt 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/Documentation/sh/register-banks.txt 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1,33 @@ + Notes on register bank usage in the kernel + ========================================== @@ -9385,7 +9385,7 @@ diff -ruN linux-2.6.17-vanilla/Documentation/sh/register-banks.txt linux-2.6.17/ + diff -ruN linux-2.6.17-vanilla/Makefile linux-2.6.17/Makefile --- linux-2.6.17-vanilla/Makefile 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/Makefile 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/Makefile 2006-07-07 10:17:06.000000000 +0000 @@ -172,7 +172,7 @@ # Default value for CROSS_COMPILE is not to prefix executables # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile @@ -9397,22 +9397,22 @@ diff -ruN linux-2.6.17-vanilla/Makefile linux-2.6.17/Makefile # Architecture as present in compile.h diff -ruN linux-2.6.17-vanilla/arch/CVS/Entries linux-2.6.17/arch/CVS/Entries --- linux-2.6.17-vanilla/arch/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/CVS/Entries 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/CVS/Entries 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1 @@ +D/sh//// diff -ruN linux-2.6.17-vanilla/arch/CVS/Repository linux-2.6.17/arch/CVS/Repository --- linux-2.6.17-vanilla/arch/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/CVS/Repository 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/CVS/Repository 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1 @@ +linux/arch diff -ruN linux-2.6.17-vanilla/arch/CVS/Root linux-2.6.17/arch/CVS/Root --- linux-2.6.17-vanilla/arch/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/CVS/Root 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/CVS/Root 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/CVS/Entries linux-2.6.17/arch/sh/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/CVS/Entries 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/CVS/Entries 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1,13 @@ +/Kconfig.debug/1.4/Mon Jan 30 16:05:57 2006/-ko/ +D/boards//// @@ -9429,17 +9429,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/CVS/Entries linux-2.6.17/arch/sh/CVS/Entr +/Kconfig/1.98/Thu Jul 6 12:38:00 2006/-ko/ diff -ruN linux-2.6.17-vanilla/arch/sh/CVS/Repository linux-2.6.17/arch/sh/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/CVS/Repository 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/CVS/Repository 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh diff -ruN linux-2.6.17-vanilla/arch/sh/CVS/Root linux-2.6.17/arch/sh/CVS/Root --- linux-2.6.17-vanilla/arch/sh/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/CVS/Root 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/CVS/Root 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/Kconfig linux-2.6.17/arch/sh/Kconfig --- linux-2.6.17-vanilla/arch/sh/Kconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/Kconfig 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/Kconfig 2006-07-07 10:17:06.000000000 +0000 @@ -255,7 +255,7 @@ value on any of the known systems will only lead to disaster. @@ -9500,7 +9500,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/Kconfig linux-2.6.17/arch/sh/Kconfig source "drivers/Kconfig" diff -ruN linux-2.6.17-vanilla/arch/sh/Kconfig.debug linux-2.6.17/arch/sh/Kconfig.debug --- linux-2.6.17-vanilla/arch/sh/Kconfig.debug 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/Kconfig.debug 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/Kconfig.debug 2006-07-07 10:17:07.000000000 +0000 @@ -32,6 +32,7 @@ config KGDB @@ -9525,7 +9525,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/Kconfig.debug linux-2.6.17/arch/sh/Kconfi endmenu diff -ruN linux-2.6.17-vanilla/arch/sh/Makefile linux-2.6.17/arch/sh/Makefile --- linux-2.6.17-vanilla/arch/sh/Makefile 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/Makefile 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/Makefile 2006-07-07 10:17:06.000000000 +0000 @@ -104,16 +104,14 @@ machdir-$(CONFIG_SH_RTS7751R2D) := renesas/rts7751r2d machdir-$(CONFIG_SH_7751_SYSTEMH) := renesas/systemh @@ -9588,7 +9588,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/Makefile linux-2.6.17/arch/sh/Makefile maketools: include/linux/version.h FORCE diff -ruN linux-2.6.17-vanilla/arch/sh/boards/CVS/Entries linux-2.6.17/arch/sh/boards/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/CVS/Entries 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/CVS/Entries 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1,21 @@ +D/adx//// +D/bigsur//// @@ -9613,17 +9613,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/CVS/Entries linux-2.6.17/arch/sh/b +D/unknown//// diff -ruN linux-2.6.17-vanilla/arch/sh/boards/CVS/Repository linux-2.6.17/arch/sh/boards/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/CVS/Repository 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/CVS/Repository 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards diff -ruN linux-2.6.17-vanilla/arch/sh/boards/CVS/Root linux-2.6.17/arch/sh/boards/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/CVS/Root 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/CVS/Root 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/adx/CVS/Entries linux-2.6.17/arch/sh/boards/adx/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/adx/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/adx/CVS/Entries 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/adx/CVS/Entries 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1,5 @@ +/Makefile/1.5/Thu Mar 11 18:08:01 2004// +/irq.c/1.2/Fri Nov 1 17:19:14 2002// @@ -9632,17 +9632,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/adx/CVS/Entries linux-2.6.17/arch/ +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/adx/CVS/Repository linux-2.6.17/arch/sh/boards/adx/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/adx/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/adx/CVS/Repository 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/adx/CVS/Repository 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/adx diff -ruN linux-2.6.17-vanilla/arch/sh/boards/adx/CVS/Root linux-2.6.17/arch/sh/boards/adx/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/adx/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/adx/CVS/Root 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/adx/CVS/Root 2006-07-07 10:17:06.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/bigsur/CVS/Entries linux-2.6.17/arch/sh/boards/bigsur/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/bigsur/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/bigsur/CVS/Entries 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/bigsur/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,6 @@ +/Makefile/1.6/Thu Mar 11 18:08:02 2004// +/io.c/1.4/Tue Mar 8 06:46:55 2005// @@ -9652,17 +9652,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/bigsur/CVS/Entries linux-2.6.17/ar +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/bigsur/CVS/Repository linux-2.6.17/arch/sh/boards/bigsur/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/bigsur/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/bigsur/CVS/Repository 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/bigsur/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/bigsur diff -ruN linux-2.6.17-vanilla/arch/sh/boards/bigsur/CVS/Root linux-2.6.17/arch/sh/boards/bigsur/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/bigsur/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/bigsur/CVS/Root 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/bigsur/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/cat68701/CVS/Entries linux-2.6.17/arch/sh/boards/cat68701/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/cat68701/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/cat68701/CVS/Entries 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/cat68701/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,4 @@ +/Makefile/1.5/Thu Mar 11 18:08:02 2004// +/irq.c/1.2/Fri Nov 1 17:19:15 2002// @@ -9670,17 +9670,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/cat68701/CVS/Entries linux-2.6.17/ +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/cat68701/CVS/Repository linux-2.6.17/arch/sh/boards/cat68701/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/cat68701/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/cat68701/CVS/Repository 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/cat68701/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/cat68701 diff -ruN linux-2.6.17-vanilla/arch/sh/boards/cat68701/CVS/Root linux-2.6.17/arch/sh/boards/cat68701/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/cat68701/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/cat68701/CVS/Root 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/cat68701/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/cqreek/CVS/Entries linux-2.6.17/arch/sh/boards/cqreek/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/cqreek/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/cqreek/CVS/Entries 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/cqreek/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,4 @@ +/Makefile/1.6/Thu Mar 11 18:08:02 2004// +/irq.c/1.4/Fri Oct 28 13:12:47 2005/-ko/ @@ -9688,17 +9688,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/cqreek/CVS/Entries linux-2.6.17/ar +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/cqreek/CVS/Repository linux-2.6.17/arch/sh/boards/cqreek/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/cqreek/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/cqreek/CVS/Repository 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/cqreek/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/cqreek diff -ruN linux-2.6.17-vanilla/arch/sh/boards/cqreek/CVS/Root linux-2.6.17/arch/sh/boards/cqreek/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/cqreek/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/cqreek/CVS/Root 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/cqreek/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/cqreek/irq.c linux-2.6.17/arch/sh/boards/cqreek/irq.c --- linux-2.6.17-vanilla/arch/sh/boards/cqreek/irq.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/cqreek/irq.c 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/cqreek/irq.c 2006-07-07 10:17:07.000000000 +0000 @@ -1,4 +1,4 @@ -/* $Id: irq.c,v 1.1.2.4 2002/11/04 20:33:56 lethal Exp $ +/* $Id: irq.c,v 1.3 2003/05/04 19:29:46 lethal Exp $ @@ -9707,24 +9707,24 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/cqreek/irq.c linux-2.6.17/arch/sh/ * diff -ruN linux-2.6.17-vanilla/arch/sh/boards/dmida/CVS/Entries linux-2.6.17/arch/sh/boards/dmida/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/dmida/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/dmida/CVS/Entries 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/dmida/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,3 @@ +/Makefile/1.4/Thu Mar 11 18:08:02 2004// +/mach.c/1.5/Tue Sep 9 00:14:07 2003// +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/dmida/CVS/Repository linux-2.6.17/arch/sh/boards/dmida/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/dmida/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/dmida/CVS/Repository 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/dmida/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/dmida diff -ruN linux-2.6.17-vanilla/arch/sh/boards/dmida/CVS/Root linux-2.6.17/arch/sh/boards/dmida/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/dmida/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/dmida/CVS/Root 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/dmida/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/dreamcast/CVS/Entries linux-2.6.17/arch/sh/boards/dreamcast/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/dreamcast/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/dreamcast/CVS/Entries 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/dreamcast/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,5 @@ +/Makefile/1.7/Thu Mar 11 18:08:02 2004// +/irq.c/1.5/Fri Aug 26 20:12:14 2005// @@ -9733,17 +9733,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/dreamcast/CVS/Entries linux-2.6.17 +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/dreamcast/CVS/Repository linux-2.6.17/arch/sh/boards/dreamcast/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/dreamcast/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/dreamcast/CVS/Repository 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/dreamcast/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/dreamcast diff -ruN linux-2.6.17-vanilla/arch/sh/boards/dreamcast/CVS/Root linux-2.6.17/arch/sh/boards/dreamcast/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/dreamcast/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/dreamcast/CVS/Root 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/dreamcast/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/dreamcast/irq.c linux-2.6.17/arch/sh/boards/dreamcast/irq.c --- linux-2.6.17-vanilla/arch/sh/boards/dreamcast/irq.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/dreamcast/irq.c 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/dreamcast/irq.c 2006-07-07 10:17:07.000000000 +0000 @@ -26,10 +26,10 @@ event. @@ -9761,7 +9761,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/dreamcast/irq.c linux-2.6.17/arch/ respond to them as they would a normal interrupt. In order to keep this diff -ruN linux-2.6.17-vanilla/arch/sh/boards/dreamcast/rtc.c linux-2.6.17/arch/sh/boards/dreamcast/rtc.c --- linux-2.6.17-vanilla/arch/sh/boards/dreamcast/rtc.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/dreamcast/rtc.c 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/dreamcast/rtc.c 2006-07-07 10:17:07.000000000 +0000 @@ -1,4 +1,5 @@ -/* arch/sh/kernel/rtc-aica.c +/* @@ -9810,7 +9810,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/dreamcast/rtc.c linux-2.6.17/arch/ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/dreamcast/setup.c linux-2.6.17/arch/sh/boards/dreamcast/setup.c --- linux-2.6.17-vanilla/arch/sh/boards/dreamcast/setup.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/dreamcast/setup.c 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/dreamcast/setup.c 2006-07-07 10:17:07.000000000 +0000 @@ -25,18 +25,16 @@ #include <asm/io.h> @@ -9834,7 +9834,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/dreamcast/setup.c linux-2.6.17/arc const char *get_system_type(void) diff -ruN linux-2.6.17-vanilla/arch/sh/boards/ec3104/CVS/Entries linux-2.6.17/arch/sh/boards/ec3104/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/ec3104/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/ec3104/CVS/Entries 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/ec3104/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,5 @@ +/Makefile/1.5/Thu Mar 11 18:08:02 2004// +/io.c/1.2/Fri Nov 1 17:19:17 2002// @@ -9843,17 +9843,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/ec3104/CVS/Entries linux-2.6.17/ar +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/ec3104/CVS/Repository linux-2.6.17/arch/sh/boards/ec3104/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/ec3104/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/ec3104/CVS/Repository 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/ec3104/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/ec3104 diff -ruN linux-2.6.17-vanilla/arch/sh/boards/ec3104/CVS/Root linux-2.6.17/arch/sh/boards/ec3104/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/ec3104/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/ec3104/CVS/Root 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/ec3104/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/harp/CVS/Entries linux-2.6.17/arch/sh/boards/harp/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/harp/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/harp/CVS/Entries 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/harp/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,7 @@ +/Makefile/1.4/Thu Mar 11 18:08:02 2004// +/irq.c/1.4/Fri Oct 28 13:12:47 2005// @@ -9864,17 +9864,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/harp/CVS/Entries linux-2.6.17/arch +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/harp/CVS/Repository linux-2.6.17/arch/sh/boards/harp/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/harp/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/harp/CVS/Repository 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/harp/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/harp diff -ruN linux-2.6.17-vanilla/arch/sh/boards/harp/CVS/Root linux-2.6.17/arch/sh/boards/harp/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/harp/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/harp/CVS/Root 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/harp/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/hp6xx/CVS/Entries linux-2.6.17/arch/sh/boards/hp6xx/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/hp6xx/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/hp6xx/CVS/Entries 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/hp6xx/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,7 @@ +/Makefile/1.2/Sun Jan 29 17:46:23 2006/-ko/ +/hp6xx_apm.c/1.2/Mon Jan 30 15:57:17 2006// @@ -9885,17 +9885,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/hp6xx/CVS/Entries linux-2.6.17/arc +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/hp6xx/CVS/Repository linux-2.6.17/arch/sh/boards/hp6xx/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/hp6xx/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/hp6xx/CVS/Repository 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/hp6xx/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/hp6xx diff -ruN linux-2.6.17-vanilla/arch/sh/boards/hp6xx/CVS/Root linux-2.6.17/arch/sh/boards/hp6xx/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/hp6xx/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/hp6xx/CVS/Root 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/hp6xx/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/hp6xx/Makefile linux-2.6.17/arch/sh/boards/hp6xx/Makefile --- linux-2.6.17-vanilla/arch/sh/boards/hp6xx/Makefile 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/hp6xx/Makefile 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/hp6xx/Makefile 2006-07-07 10:17:07.000000000 +0000 @@ -2,5 +2,8 @@ # Makefile for the HP6xx specific parts of the kernel # @@ -9908,7 +9908,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/hp6xx/Makefile linux-2.6.17/arch/s diff -ruN linux-2.6.17-vanilla/arch/sh/boards/hp6xx/hp6xx_apm.c linux-2.6.17/arch/sh/boards/hp6xx/hp6xx_apm.c --- linux-2.6.17-vanilla/arch/sh/boards/hp6xx/hp6xx_apm.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/hp6xx/hp6xx_apm.c 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/hp6xx/hp6xx_apm.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,123 @@ +/* + * bios-less APM driver for hp680 @@ -10035,7 +10035,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/hp6xx/hp6xx_apm.c linux-2.6.17/arc +MODULE_LICENSE("GPL"); diff -ruN linux-2.6.17-vanilla/arch/sh/boards/hp6xx/pm.c linux-2.6.17/arch/sh/boards/hp6xx/pm.c --- linux-2.6.17-vanilla/arch/sh/boards/hp6xx/pm.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/hp6xx/pm.c 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/hp6xx/pm.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,88 @@ +/* + * hp6x0 Power Management Routines @@ -10127,7 +10127,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/hp6xx/pm.c linux-2.6.17/arch/sh/bo +late_initcall(hp6x0_pm_init); diff -ruN linux-2.6.17-vanilla/arch/sh/boards/hp6xx/pm_wakeup.S linux-2.6.17/arch/sh/boards/hp6xx/pm_wakeup.S --- linux-2.6.17-vanilla/arch/sh/boards/hp6xx/pm_wakeup.S 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/hp6xx/pm_wakeup.S 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/hp6xx/pm_wakeup.S 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2006 Andriy Skulysh <askulsyh@gmail.com> @@ -10189,7 +10189,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/hp6xx/pm_wakeup.S linux-2.6.17/arc + nop diff -ruN linux-2.6.17-vanilla/arch/sh/boards/hp6xx/setup.c linux-2.6.17/arch/sh/boards/hp6xx/setup.c --- linux-2.6.17-vanilla/arch/sh/boards/hp6xx/setup.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/hp6xx/setup.c 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/hp6xx/setup.c 2006-07-07 10:17:07.000000000 +0000 @@ -16,6 +16,9 @@ #include <asm/hp6xx/hp6xx.h> #include <asm/cpu/dac.h> @@ -10226,7 +10226,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/hp6xx/setup.c linux-2.6.17/arch/sh } diff -ruN linux-2.6.17-vanilla/arch/sh/boards/landisk/CVS/Entries linux-2.6.17/arch/sh/boards/landisk/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/landisk/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/landisk/CVS/Entries 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/landisk/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,7 @@ +/Makefile/1.2/Wed Feb 8 21:55:09 2006/-ko/ +/io.c/1.4/Sun Feb 5 21:55:28 2006/-ko/ @@ -10237,17 +10237,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/landisk/CVS/Entries linux-2.6.17/a +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/landisk/CVS/Repository linux-2.6.17/arch/sh/boards/landisk/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/landisk/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/landisk/CVS/Repository 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/landisk/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/landisk diff -ruN linux-2.6.17-vanilla/arch/sh/boards/landisk/CVS/Root linux-2.6.17/arch/sh/boards/landisk/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/landisk/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/landisk/CVS/Root 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/landisk/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/landisk/Makefile linux-2.6.17/arch/sh/boards/landisk/Makefile --- linux-2.6.17-vanilla/arch/sh/boards/landisk/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/landisk/Makefile 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/landisk/Makefile 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,5 @@ +# +# Makefile for I-O DATA DEVICE, INC. "LANDISK Series" @@ -10256,7 +10256,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/landisk/Makefile linux-2.6.17/arch +obj-y := setup.o io.o irq.o rtc.o landisk_pwb.o diff -ruN linux-2.6.17-vanilla/arch/sh/boards/landisk/io.c linux-2.6.17/arch/sh/boards/landisk/io.c --- linux-2.6.17-vanilla/arch/sh/boards/landisk/io.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/landisk/io.c 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/landisk/io.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,250 @@ +/* + * arch/sh/boards/landisk/io.c @@ -10510,7 +10510,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/landisk/io.c linux-2.6.17/arch/sh/ +} diff -ruN linux-2.6.17-vanilla/arch/sh/boards/landisk/irq.c linux-2.6.17/arch/sh/boards/landisk/irq.c --- linux-2.6.17-vanilla/arch/sh/boards/landisk/irq.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/landisk/irq.c 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/landisk/irq.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,105 @@ +/* + * arch/sh/boards/landisk/irq.c @@ -10619,7 +10619,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/landisk/irq.c linux-2.6.17/arch/sh +} diff -ruN linux-2.6.17-vanilla/arch/sh/boards/landisk/landisk_pwb.c linux-2.6.17/arch/sh/boards/landisk/landisk_pwb.c --- linux-2.6.17-vanilla/arch/sh/boards/landisk/landisk_pwb.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/landisk/landisk_pwb.c 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/landisk/landisk_pwb.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,348 @@ +/* + * arch/sh/boards/landisk/landisk_pwb.c -- driver for the Power control switch. @@ -10971,7 +10971,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/landisk/landisk_pwb.c linux-2.6.17 +} diff -ruN linux-2.6.17-vanilla/arch/sh/boards/landisk/rtc.c linux-2.6.17/arch/sh/boards/landisk/rtc.c --- linux-2.6.17-vanilla/arch/sh/boards/landisk/rtc.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/landisk/rtc.c 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/landisk/rtc.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,102 @@ +/* + * arch/sh/boards/landisk/rtc.c -- RTC support @@ -11077,7 +11077,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/landisk/rtc.c linux-2.6.17/arch/sh +} diff -ruN linux-2.6.17-vanilla/arch/sh/boards/landisk/setup.c linux-2.6.17/arch/sh/boards/landisk/setup.c --- linux-2.6.17-vanilla/arch/sh/boards/landisk/setup.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/landisk/setup.c 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/landisk/setup.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,179 @@ +/* + * arch/sh/boards/landisk/setup.c @@ -11260,7 +11260,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/landisk/setup.c linux-2.6.17/arch/ +__initcall(landisk_cf_init); diff -ruN linux-2.6.17-vanilla/arch/sh/boards/mpc1211/CVS/Entries linux-2.6.17/arch/sh/boards/mpc1211/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/mpc1211/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/mpc1211/CVS/Entries 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/mpc1211/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,6 @@ +/Makefile/1.4/Thu Mar 11 18:08:02 2004/-ko/ +/led.c/1.1/Fri May 16 17:18:15 2003/-ko/ @@ -11270,17 +11270,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/mpc1211/CVS/Entries linux-2.6.17/a +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/mpc1211/CVS/Repository linux-2.6.17/arch/sh/boards/mpc1211/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/mpc1211/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/mpc1211/CVS/Repository 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/mpc1211/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/mpc1211 diff -ruN linux-2.6.17-vanilla/arch/sh/boards/mpc1211/CVS/Root linux-2.6.17/arch/sh/boards/mpc1211/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/mpc1211/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/mpc1211/CVS/Root 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/mpc1211/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/mpc1211/setup.c linux-2.6.17/arch/sh/boards/mpc1211/setup.c --- linux-2.6.17-vanilla/arch/sh/boards/mpc1211/setup.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/mpc1211/setup.c 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/mpc1211/setup.c 2006-07-07 10:17:07.000000000 +0000 @@ -256,23 +256,12 @@ } } @@ -11309,7 +11309,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/mpc1211/setup.c linux-2.6.17/arch/ static int put_smb_blk(unsigned char *p, int address, int command, int no) diff -ruN linux-2.6.17-vanilla/arch/sh/boards/overdrive/CVS/Entries linux-2.6.17/arch/sh/boards/overdrive/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/overdrive/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/overdrive/CVS/Entries 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/overdrive/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,11 @@ +/Makefile/1.5/Sat Mar 26 20:25:35 2005// +/fpga.c/1.2/Fri Nov 1 17:19:19 2002// @@ -11324,17 +11324,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/overdrive/CVS/Entries linux-2.6.17 +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/overdrive/CVS/Repository linux-2.6.17/arch/sh/boards/overdrive/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/overdrive/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/overdrive/CVS/Repository 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/overdrive/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/overdrive diff -ruN linux-2.6.17-vanilla/arch/sh/boards/overdrive/CVS/Root linux-2.6.17/arch/sh/boards/overdrive/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/overdrive/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/overdrive/CVS/Root 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/overdrive/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/overdrive/overdrive.ttf linux-2.6.17/arch/sh/boards/overdrive/overdrive.ttf --- linux-2.6.17-vanilla/arch/sh/boards/overdrive/overdrive.ttf 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/overdrive/overdrive.ttf 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/overdrive/overdrive.ttf 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,770 @@ +255,255, 98,255, 51, 0,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, +160, 9, 52,129, 38,208, 4,154, 64, 19, 0, 89, 96, 10,100,129,137,134, 85, 6,154, 0, 25,104, 2, 77,160, 76,148, 1, 0, 0, 0, 0, 0, 6,202, 0, 25, 0, 89,100,170, 9, 52,129, 38, 80, 6,154, 68, 19,112, 2, 96, 10, 76,149,129, 50, 64, 6,200, 0,188,254, @@ -12108,7 +12108,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/overdrive/overdrive.ttf linux-2.6. +255,255 diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/CVS/Entries linux-2.6.17/arch/sh/boards/renesas/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/renesas/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/CVS/Entries 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,5 @@ +D/edosk7705//// +D/hs7751rvoip//// @@ -12117,17 +12117,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/CVS/Entries linux-2.6.17/a +D/systemh//// diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/CVS/Repository linux-2.6.17/arch/sh/boards/renesas/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/renesas/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/CVS/Repository 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/renesas diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/CVS/Root linux-2.6.17/arch/sh/boards/renesas/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/renesas/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/CVS/Root 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/edosk7705/CVS/Entries linux-2.6.17/arch/sh/boards/renesas/edosk7705/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/renesas/edosk7705/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/edosk7705/CVS/Entries 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/edosk7705/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,4 @@ +/Makefile/1.2/Sun Oct 16 16:31:08 2005/-ko/ +/io.c/1.1/Mon Aug 30 12:55:31 2004/-ko/ @@ -12135,17 +12135,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/edosk7705/CVS/Entries linu +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/edosk7705/CVS/Repository linux-2.6.17/arch/sh/boards/renesas/edosk7705/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/renesas/edosk7705/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/edosk7705/CVS/Repository 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/edosk7705/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/renesas/edosk7705 diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/edosk7705/CVS/Root linux-2.6.17/arch/sh/boards/renesas/edosk7705/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/renesas/edosk7705/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/edosk7705/CVS/Root 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/edosk7705/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/edosk7705/Makefile linux-2.6.17/arch/sh/boards/renesas/edosk7705/Makefile --- linux-2.6.17-vanilla/arch/sh/boards/renesas/edosk7705/Makefile 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/edosk7705/Makefile 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/edosk7705/Makefile 2006-07-07 10:17:07.000000000 +0000 @@ -1,10 +1,6 @@ # # Makefile for the EDOSK7705 specific parts of the kernel @@ -12159,7 +12159,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/edosk7705/Makefile linux-2 diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/hs7751rvoip/CVS/Entries linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/renesas/hs7751rvoip/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/CVS/Entries 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,7 @@ +/Kconfig/1.1/Fri Jun 24 11:21:00 2005/-ko/ +/Makefile/1.4/Wed Nov 23 15:42:02 2005/-ko/ @@ -12170,17 +12170,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/hs7751rvoip/CVS/Entries li +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/hs7751rvoip/CVS/Repository linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/renesas/hs7751rvoip/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/CVS/Repository 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/renesas/hs7751rvoip diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/hs7751rvoip/CVS/Root linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/renesas/hs7751rvoip/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/CVS/Root 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/hs7751rvoip/Kconfig linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/Kconfig --- linux-2.6.17-vanilla/arch/sh/boards/renesas/hs7751rvoip/Kconfig 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/Kconfig 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/Kconfig 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,12 @@ +if SH_HS7751RVOIP + @@ -12196,7 +12196,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/hs7751rvoip/Kconfig linux- +endif diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/hs7751rvoip/Makefile linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/Makefile --- linux-2.6.17-vanilla/arch/sh/boards/renesas/hs7751rvoip/Makefile 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/Makefile 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/Makefile 2006-07-07 10:17:07.000000000 +0000 @@ -1,12 +1,8 @@ # # Makefile for the HS7751RVoIP specific parts of the kernel @@ -12213,7 +12213,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/hs7751rvoip/Makefile linux diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/hs7751rvoip/io.c linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/io.c --- linux-2.6.17-vanilla/arch/sh/boards/renesas/hs7751rvoip/io.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/io.c 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/io.c 2006-07-07 10:17:07.000000000 +0000 @@ -14,18 +14,13 @@ #include <linux/config.h> #include <linux/kernel.h> @@ -12612,7 +12612,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/hs7751rvoip/io.c linux-2.6 } diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/hs7751rvoip/setup.c linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/setup.c --- linux-2.6.17-vanilla/arch/sh/boards/renesas/hs7751rvoip/setup.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/setup.c 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/setup.c 2006-07-07 10:17:07.000000000 +0000 @@ -13,25 +13,68 @@ #include <linux/config.h> #include <linux/init.h> @@ -12746,7 +12746,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/hs7751rvoip/setup.c linux- +__initcall(hs7751rvoip_cf_init); diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/r7780rp/CVS/Entries linux-2.6.17/arch/sh/boards/renesas/r7780rp/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/renesas/r7780rp/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/r7780rp/CVS/Entries 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/r7780rp/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,7 @@ +/Makefile/1.1/Sat Jan 7 19:55:56 2006/-ko/ +/io.c/1.2/Sun Feb 5 21:55:28 2006/-ko/ @@ -12757,17 +12757,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/r7780rp/CVS/Entries linux- +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/r7780rp/CVS/Repository linux-2.6.17/arch/sh/boards/renesas/r7780rp/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/renesas/r7780rp/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/r7780rp/CVS/Repository 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/r7780rp/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/renesas/r7780rp diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/r7780rp/CVS/Root linux-2.6.17/arch/sh/boards/renesas/r7780rp/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/renesas/r7780rp/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/r7780rp/CVS/Root 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/r7780rp/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/r7780rp/Kconfig linux-2.6.17/arch/sh/boards/renesas/r7780rp/Kconfig --- linux-2.6.17-vanilla/arch/sh/boards/renesas/r7780rp/Kconfig 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/r7780rp/Kconfig 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/r7780rp/Kconfig 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,14 @@ +if SH_R7780RP + @@ -12785,7 +12785,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/r7780rp/Kconfig linux-2.6. +endif diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/r7780rp/Makefile linux-2.6.17/arch/sh/boards/renesas/r7780rp/Makefile --- linux-2.6.17-vanilla/arch/sh/boards/renesas/r7780rp/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/r7780rp/Makefile 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/r7780rp/Makefile 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,6 @@ +# +# Makefile for the R7780RP-1 specific parts of the kernel @@ -12795,7 +12795,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/r7780rp/Makefile linux-2.6 +obj-$(CONFIG_HEARTBEAT) += led.o diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/r7780rp/io.c linux-2.6.17/arch/sh/boards/renesas/r7780rp/io.c --- linux-2.6.17-vanilla/arch/sh/boards/renesas/r7780rp/io.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/r7780rp/io.c 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/r7780rp/io.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,301 @@ +/* + * Copyright (C) 2001 Ian da Silva, Jeremy Siegel @@ -13100,7 +13100,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/r7780rp/io.c linux-2.6.17/ +} diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/r7780rp/irq.c linux-2.6.17/arch/sh/boards/renesas/r7780rp/irq.c --- linux-2.6.17-vanilla/arch/sh/boards/renesas/r7780rp/irq.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/r7780rp/irq.c 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/r7780rp/irq.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,123 @@ +/* + * linux/arch/sh/boards/renesas/r7780rp/irq.c @@ -13227,7 +13227,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/r7780rp/irq.c linux-2.6.17 +} diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/r7780rp/led.c linux-2.6.17/arch/sh/boards/renesas/r7780rp/led.c --- linux-2.6.17-vanilla/arch/sh/boards/renesas/r7780rp/led.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/r7780rp/led.c 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/r7780rp/led.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,45 @@ +/* + * Copyright (C) Atom Create Engineering Co., Ltd. @@ -13276,7 +13276,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/r7780rp/led.c linux-2.6.17 +} diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/r7780rp/setup.c linux-2.6.17/arch/sh/boards/renesas/r7780rp/setup.c --- linux-2.6.17-vanilla/arch/sh/boards/renesas/r7780rp/setup.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/r7780rp/setup.c 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/r7780rp/setup.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,164 @@ +/* + * arch/sh/boards/renesas/r7780rp/setup.c @@ -13444,7 +13444,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/r7780rp/setup.c linux-2.6. +} diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/CVS/Entries linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/CVS/Entries 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,8 @@ +/Kconfig/1.1/Fri Jun 24 11:21:00 2005/-ko/ +/Makefile/1.2/Sun Oct 16 16:31:08 2005/-ko/ @@ -13456,17 +13456,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/CVS/Entries lin +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/CVS/Repository linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/CVS/Repository 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/renesas/rts7751r2d diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/CVS/Root linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/CVS/Root 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/Kconfig linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/Kconfig --- linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/Kconfig 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/Kconfig 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/Kconfig 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,12 @@ +if SH_RTS7751R2D + @@ -13482,7 +13482,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/Kconfig linux-2 + diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/Makefile linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/Makefile --- linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/Makefile 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/Makefile 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/Makefile 2006-07-07 10:17:07.000000000 +0000 @@ -1,10 +1,6 @@ # # Makefile for the RTS7751R2D specific parts of the kernel @@ -13496,7 +13496,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/Makefile linux- diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/io.c linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/io.c --- linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/io.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/io.c 2006-07-06 12:42:54.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/io.c 2006-07-07 10:17:07.000000000 +0000 @@ -1,6 +1,4 @@ /* - * linux/arch/sh/kernel/io_rts7751r2d.c @@ -13859,7 +13859,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/io.c linux-2.6. { diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/led.c linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/led.c --- linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/led.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/led.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/led.c 2006-07-07 10:17:07.000000000 +0000 @@ -56,12 +56,3 @@ ctrl_outw(value, PA_OUTPORT); } @@ -13875,7 +13875,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/led.c linux-2.6 -} diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/mach.c linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/mach.c --- linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/mach.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/mach.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/mach.c 2006-07-07 10:17:07.000000000 +0000 @@ -16,15 +16,16 @@ #include <asm/machvec.h> #include <asm/rtc.h> @@ -13914,7 +13914,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/mach.c linux-2. #endif diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/setup.c linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/setup.c --- linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/setup.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/setup.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/setup.c 2006-07-07 10:17:07.000000000 +0000 @@ -1,25 +1,89 @@ /* - * linux/arch/sh/kernel/setup_rts7751r2d.c @@ -14025,7 +14025,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/setup.c linux-2 } diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/systemh/CVS/Entries linux-2.6.17/arch/sh/boards/renesas/systemh/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/renesas/systemh/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/systemh/CVS/Entries 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/systemh/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,5 @@ +/Makefile/1.1/Tue Jun 15 18:32:21 2004/-ko/ +/io.c/1.5/Sun Feb 5 21:55:29 2006/-ko/ @@ -14034,17 +14034,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/systemh/CVS/Entries linux- +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/systemh/CVS/Repository linux-2.6.17/arch/sh/boards/renesas/systemh/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/renesas/systemh/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/systemh/CVS/Repository 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/systemh/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/renesas/systemh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/systemh/CVS/Root linux-2.6.17/arch/sh/boards/renesas/systemh/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/renesas/systemh/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/systemh/CVS/Root 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/systemh/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/systemh/io.c linux-2.6.17/arch/sh/boards/renesas/systemh/io.c --- linux-2.6.17-vanilla/arch/sh/boards/renesas/systemh/io.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/systemh/io.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/systemh/io.c 2006-07-07 10:17:07.000000000 +0000 @@ -5,66 +5,25 @@ * Based largely on io_se.c. * @@ -14323,7 +14323,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/systemh/io.c linux-2.6.17/ } diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/systemh/irq.c linux-2.6.17/arch/sh/boards/renesas/systemh/irq.c --- linux-2.6.17-vanilla/arch/sh/boards/renesas/systemh/irq.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/systemh/irq.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/systemh/irq.c 2006-07-07 10:17:07.000000000 +0000 @@ -16,7 +16,7 @@ #include <linux/hdreg.h> #include <linux/ide.h> @@ -14335,7 +14335,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/systemh/irq.c linux-2.6.17 /* address of external interrupt mask register diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/systemh/setup.c linux-2.6.17/arch/sh/boards/renesas/systemh/setup.c --- linux-2.6.17-vanilla/arch/sh/boards/renesas/systemh/setup.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/renesas/systemh/setup.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/renesas/systemh/setup.c 2006-07-07 10:17:07.000000000 +0000 @@ -15,9 +15,8 @@ * for more details. */ @@ -14374,7 +14374,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/systemh/setup.c linux-2.6. ALIAS_MV(7751systemh) diff -ruN linux-2.6.17-vanilla/arch/sh/boards/saturn/CVS/Entries linux-2.6.17/arch/sh/boards/saturn/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/saturn/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/saturn/CVS/Entries 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/saturn/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,6 @@ +/Makefile/1.4/Thu Mar 11 18:08:03 2004/-ko/ +/io.c/1.2/Sun May 4 19:29:47 2003/-ko/ @@ -14384,17 +14384,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/saturn/CVS/Entries linux-2.6.17/ar +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/saturn/CVS/Repository linux-2.6.17/arch/sh/boards/saturn/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/saturn/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/saturn/CVS/Repository 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/saturn/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/saturn diff -ruN linux-2.6.17-vanilla/arch/sh/boards/saturn/CVS/Root linux-2.6.17/arch/sh/boards/saturn/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/saturn/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/saturn/CVS/Root 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/saturn/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7300/CVS/Entries linux-2.6.17/arch/sh/boards/se/7300/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/se/7300/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/7300/CVS/Entries 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/7300/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,6 @@ +/Makefile/1.1/Fri Jun 11 13:02:47 2004// +/io.c/1.3/Wed Jan 4 17:25:52 2006// @@ -14404,17 +14404,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7300/CVS/Entries linux-2.6.17/a +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7300/CVS/Repository linux-2.6.17/arch/sh/boards/se/7300/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/se/7300/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/7300/CVS/Repository 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/7300/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/se/7300 diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7300/CVS/Root linux-2.6.17/arch/sh/boards/se/7300/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/se/7300/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/7300/CVS/Root 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/7300/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7300/io.c linux-2.6.17/arch/sh/boards/se/7300/io.c --- linux-2.6.17-vanilla/arch/sh/boards/se/7300/io.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/7300/io.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/7300/io.c 2006-07-07 10:17:07.000000000 +0000 @@ -10,8 +10,8 @@ #include <linux/config.h> @@ -14466,7 +14466,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7300/io.c linux-2.6.17/arch/sh/ #endif diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7300/irq.c linux-2.6.17/arch/sh/boards/se/7300/irq.c --- linux-2.6.17-vanilla/arch/sh/boards/se/7300/irq.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/7300/irq.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/7300/irq.c 2006-07-07 10:17:07.000000000 +0000 @@ -12,7 +12,7 @@ #include <linux/irq.h> #include <asm/irq.h> @@ -14478,7 +14478,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7300/irq.c linux-2.6.17/arch/sh * Initialize IRQ setting diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7300/led.c linux-2.6.17/arch/sh/boards/se/7300/led.c --- linux-2.6.17-vanilla/arch/sh/boards/se/7300/led.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/7300/led.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/7300/led.c 2006-07-07 10:17:07.000000000 +0000 @@ -13,24 +13,10 @@ #include <linux/config.h> @@ -14508,7 +14508,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7300/led.c linux-2.6.17/arch/sh volatile unsigned short *p = (volatile unsigned short *) PA_LED; diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7300/setup.c linux-2.6.17/arch/sh/boards/se/7300/setup.c --- linux-2.6.17-vanilla/arch/sh/boards/se/7300/setup.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/7300/setup.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/7300/setup.c 2006-07-07 10:17:07.000000000 +0000 @@ -10,8 +10,7 @@ #include <linux/config.h> #include <linux/init.h> @@ -14521,7 +14521,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7300/setup.c linux-2.6.17/arch/ void init_7300se_IRQ(void); diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/73180/CVS/Entries linux-2.6.17/arch/sh/boards/se/73180/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/se/73180/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/73180/CVS/Entries 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/73180/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,6 @@ +/Makefile/1.1/Mon Jun 28 13:18:45 2004// +/io.c/1.2/Tue May 31 14:00:25 2005// @@ -14531,17 +14531,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/73180/CVS/Entries linux-2.6.17/ +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/73180/CVS/Repository linux-2.6.17/arch/sh/boards/se/73180/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/se/73180/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/73180/CVS/Repository 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/73180/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/se/73180 diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/73180/CVS/Root linux-2.6.17/arch/sh/boards/se/73180/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/se/73180/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/73180/CVS/Root 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/73180/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/73180/io.c linux-2.6.17/arch/sh/boards/se/73180/io.c --- linux-2.6.17-vanilla/arch/sh/boards/se/73180/io.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/73180/io.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/73180/io.c 2006-07-07 10:17:07.000000000 +0000 @@ -100,6 +100,7 @@ badio(inw, port); } @@ -14583,7 +14583,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/73180/io.c linux-2.6.17/arch/sh #endif diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/73180/irq.c linux-2.6.17/arch/sh/boards/se/73180/irq.c --- linux-2.6.17-vanilla/arch/sh/boards/se/73180/irq.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/73180/irq.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/73180/irq.c 2006-07-07 10:17:07.000000000 +0000 @@ -7,7 +7,6 @@ * Modified for SH-Mobile SolutionEngine 73180 Support * by YOSHII Takashi <yoshii-takashi@hitachi-ul.co.jp> @@ -14609,7 +14609,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/73180/irq.c linux-2.6.17/arch/s if (irq == 10) diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/73180/led.c linux-2.6.17/arch/sh/boards/se/73180/led.c --- linux-2.6.17-vanilla/arch/sh/boards/se/73180/led.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/73180/led.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/73180/led.c 2006-07-07 10:17:07.000000000 +0000 @@ -15,21 +15,8 @@ #include <linux/sched.h> #include <asm/mach/se73180.h> @@ -14635,7 +14635,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/73180/led.c linux-2.6.17/arch/s volatile unsigned short *p = (volatile unsigned short *) PA_LED; diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/73180/setup.c linux-2.6.17/arch/sh/boards/se/73180/setup.c --- linux-2.6.17-vanilla/arch/sh/boards/se/73180/setup.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/73180/setup.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/73180/setup.c 2006-07-07 10:17:07.000000000 +0000 @@ -12,8 +12,8 @@ #include <linux/config.h> #include <linux/init.h> @@ -14657,7 +14657,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/73180/setup.c linux-2.6.17/arch #endif diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/770x/CVS/Entries linux-2.6.17/arch/sh/boards/se/770x/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/se/770x/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/770x/CVS/Entries 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/770x/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,7 @@ +/Makefile/1.5/Tue May 31 14:49:59 2005// +/io.c/1.7/Sun Feb 5 21:55:29 2006// @@ -14668,17 +14668,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/770x/CVS/Entries linux-2.6.17/a +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/770x/CVS/Repository linux-2.6.17/arch/sh/boards/se/770x/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/se/770x/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/770x/CVS/Repository 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/770x/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/se/770x diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/770x/CVS/Root linux-2.6.17/arch/sh/boards/se/770x/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/se/770x/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/770x/CVS/Root 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/770x/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/770x/Makefile linux-2.6.17/arch/sh/boards/se/770x/Makefile --- linux-2.6.17-vanilla/arch/sh/boards/se/770x/Makefile 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/770x/Makefile 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/770x/Makefile 2006-07-07 10:17:07.000000000 +0000 @@ -2,5 +2,6 @@ # Makefile for the 770x SolutionEngine specific parts of the kernel # @@ -14689,7 +14689,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/770x/Makefile linux-2.6.17/arch +obj-$(CONFIG_HEARTBEAT) += led.o diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/770x/io.c linux-2.6.17/arch/sh/boards/se/770x/io.c --- linux-2.6.17-vanilla/arch/sh/boards/se/770x/io.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/770x/io.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/770x/io.c 2006-07-07 10:17:07.000000000 +0000 @@ -1,4 +1,4 @@ -/* $Id: io.c,v 1.5 2004/02/22 23:08:43 kkojima Exp $ +/* $Id: io.c,v 1.7 2006/02/05 21:55:29 lethal Exp $ @@ -14827,7 +14827,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/770x/io.c linux-2.6.17/arch/sh/ } diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/770x/irq.c linux-2.6.17/arch/sh/boards/se/770x/irq.c --- linux-2.6.17-vanilla/arch/sh/boards/se/770x/irq.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/770x/irq.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/770x/irq.c 2006-07-07 10:17:07.000000000 +0000 @@ -12,7 +12,7 @@ #include <linux/irq.h> #include <asm/irq.h> @@ -14839,7 +14839,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/770x/irq.c linux-2.6.17/arch/sh * Initialize IRQ setting diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/770x/led.c linux-2.6.17/arch/sh/boards/se/770x/led.c --- linux-2.6.17-vanilla/arch/sh/boards/se/770x/led.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/770x/led.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/770x/led.c 2006-07-07 10:17:07.000000000 +0000 @@ -10,22 +10,8 @@ */ @@ -14871,7 +14871,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/770x/led.c linux-2.6.17/arch/sh -#endif /* CONFIG_HEARTBEAT */ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/770x/mach.c linux-2.6.17/arch/sh/boards/se/770x/mach.c --- linux-2.6.17-vanilla/arch/sh/boards/se/770x/mach.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/770x/mach.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/770x/mach.c 2006-07-07 10:17:07.000000000 +0000 @@ -14,12 +14,9 @@ #include <asm/machvec.h> @@ -14897,7 +14897,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/770x/mach.c linux-2.6.17/arch/s .mv_heartbeat = heartbeat_se, diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/770x/setup.c linux-2.6.17/arch/sh/boards/se/770x/setup.c --- linux-2.6.17-vanilla/arch/sh/boards/se/770x/setup.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/770x/setup.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/770x/setup.c 2006-07-07 10:17:07.000000000 +0000 @@ -1,4 +1,4 @@ -/* $Id: setup.c,v 1.1.2.4 2002/03/02 21:57:07 lethal Exp $ +/* $Id: setup.c,v 1.3 2003/05/04 19:29:47 lethal Exp $ @@ -14917,7 +14917,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/770x/setup.c linux-2.6.17/arch/ * Configure the Super I/O chip diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7751/CVS/Entries linux-2.6.17/arch/sh/boards/se/7751/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/se/7751/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/7751/CVS/Entries 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/7751/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,8 @@ +/Makefile/1.5/Tue May 31 15:16:49 2005// +/io.c/1.6/Sun Feb 5 21:55:29 2006// @@ -14929,17 +14929,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7751/CVS/Entries linux-2.6.17/a +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7751/CVS/Repository linux-2.6.17/arch/sh/boards/se/7751/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/se/7751/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/7751/CVS/Repository 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/7751/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/se/7751 diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7751/CVS/Root linux-2.6.17/arch/sh/boards/se/7751/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/se/7751/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/7751/CVS/Root 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/7751/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7751/Makefile linux-2.6.17/arch/sh/boards/se/7751/Makefile --- linux-2.6.17-vanilla/arch/sh/boards/se/7751/Makefile 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/7751/Makefile 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/7751/Makefile 2006-07-07 10:17:07.000000000 +0000 @@ -2,7 +2,8 @@ # Makefile for the 7751 SolutionEngine specific parts of the kernel # @@ -14952,7 +14952,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7751/Makefile linux-2.6.17/arch diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7751/io.c linux-2.6.17/arch/sh/boards/se/7751/io.c --- linux-2.6.17-vanilla/arch/sh/boards/se/7751/io.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/7751/io.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/7751/io.c 2006-07-07 10:17:07.000000000 +0000 @@ -1,6 +1,4 @@ -/* - * linux/arch/sh/kernel/io_7751se.c @@ -15222,7 +15222,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7751/io.c linux-2.6.17/arch/sh/ } diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7751/irq.c linux-2.6.17/arch/sh/boards/se/7751/irq.c --- linux-2.6.17-vanilla/arch/sh/boards/se/7751/irq.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/7751/irq.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/7751/irq.c 2006-07-07 10:17:07.000000000 +0000 @@ -13,7 +13,7 @@ #include <linux/init.h> #include <linux/irq.h> @@ -15234,7 +15234,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7751/irq.c linux-2.6.17/arch/sh * Initialize IRQ setting diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7751/led.c linux-2.6.17/arch/sh/boards/se/7751/led.c --- linux-2.6.17-vanilla/arch/sh/boards/se/7751/led.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/7751/led.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/7751/led.c 2006-07-07 10:17:07.000000000 +0000 @@ -8,24 +8,8 @@ * * This file contains Solution Engine specific LED code. @@ -15268,7 +15268,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7751/led.c linux-2.6.17/arch/sh -#endif /* CONFIG_HEARTBEAT */ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7751/mach.c linux-2.6.17/arch/sh/boards/se/7751/mach.c --- linux-2.6.17-vanilla/arch/sh/boards/se/7751/mach.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/7751/mach.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/7751/mach.c 2006-07-07 10:17:07.000000000 +0000 @@ -11,12 +11,8 @@ #include <linux/config.h> @@ -15294,7 +15294,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7751/mach.c linux-2.6.17/arch/s .mv_heartbeat = heartbeat_7751se, diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7751/setup.c linux-2.6.17/arch/sh/boards/se/7751/setup.c --- linux-2.6.17-vanilla/arch/sh/boards/se/7751/setup.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/7751/setup.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/7751/setup.c 2006-07-07 10:17:07.000000000 +0000 @@ -1,4 +1,4 @@ -/* +/* @@ -15316,7 +15316,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/7751/setup.c linux-2.6.17/arch/ #include <asm/kgdb.h> diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/CVS/Entries linux-2.6.17/arch/sh/boards/se/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/se/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/CVS/Entries 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,4 @@ +D/7300//// +D/73180//// @@ -15324,17 +15324,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/CVS/Entries linux-2.6.17/arch/s +D/7751//// diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/CVS/Repository linux-2.6.17/arch/sh/boards/se/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/se/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/CVS/Repository 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/se diff -ruN linux-2.6.17-vanilla/arch/sh/boards/se/CVS/Root linux-2.6.17/arch/sh/boards/se/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/se/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/se/CVS/Root 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/se/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/sh03/CVS/Entries linux-2.6.17/arch/sh/boards/sh03/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/sh03/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/sh03/CVS/Entries 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/sh03/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,5 @@ +/Makefile/1.1/Thu Oct 7 11:01:14 2004/-ko/ +/led.c/1.1/Thu Oct 7 11:01:14 2004/-ko/ @@ -15343,17 +15343,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/sh03/CVS/Entries linux-2.6.17/arch +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/sh03/CVS/Repository linux-2.6.17/arch/sh/boards/sh03/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/sh03/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/sh03/CVS/Repository 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/sh03/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/sh03 diff -ruN linux-2.6.17-vanilla/arch/sh/boards/sh03/CVS/Root linux-2.6.17/arch/sh/boards/sh03/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/sh03/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/sh03/CVS/Root 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/sh03/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/sh03/setup.c linux-2.6.17/arch/sh/boards/sh03/setup.c --- linux-2.6.17-vanilla/arch/sh/boards/sh03/setup.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/sh03/setup.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/sh03/setup.c 2006-07-07 10:17:07.000000000 +0000 @@ -8,22 +8,18 @@ #include <linux/config.h> #include <linux/init.h> @@ -15421,24 +15421,24 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/sh03/setup.c linux-2.6.17/arch/sh/ /* arch/sh/boards/sh03/rtc.c */ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/sh2000/CVS/Entries linux-2.6.17/arch/sh/boards/sh2000/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/sh2000/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/sh2000/CVS/Entries 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/sh2000/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,3 @@ +/Makefile/1.6/Thu Mar 11 18:08:03 2004// +/setup.c/1.4/Mon Aug 4 01:57:07 2003// +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/sh2000/CVS/Repository linux-2.6.17/arch/sh/boards/sh2000/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/sh2000/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/sh2000/CVS/Repository 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/sh2000/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/sh2000 diff -ruN linux-2.6.17-vanilla/arch/sh/boards/sh2000/CVS/Root linux-2.6.17/arch/sh/boards/sh2000/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/sh2000/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/sh2000/CVS/Root 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/sh2000/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/snapgear/CVS/Entries linux-2.6.17/arch/sh/boards/snapgear/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/snapgear/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/snapgear/CVS/Entries 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/snapgear/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,5 @@ +/Makefile/1.3/Thu Mar 11 18:08:03 2004// +/io.c/1.5/Sun Feb 5 21:55:29 2006// @@ -15447,17 +15447,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/snapgear/CVS/Entries linux-2.6.17/ +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/snapgear/CVS/Repository linux-2.6.17/arch/sh/boards/snapgear/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/snapgear/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/snapgear/CVS/Repository 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/snapgear/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/snapgear diff -ruN linux-2.6.17-vanilla/arch/sh/boards/snapgear/CVS/Root linux-2.6.17/arch/sh/boards/snapgear/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/snapgear/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/snapgear/CVS/Root 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/snapgear/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/snapgear/io.c linux-2.6.17/arch/sh/boards/snapgear/io.c --- linux-2.6.17-vanilla/arch/sh/boards/snapgear/io.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/snapgear/io.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/snapgear/io.c 2006-07-07 10:17:07.000000000 +0000 @@ -1,6 +1,4 @@ -/* - * linux/arch/sh/kernel/io_7751se.c @@ -15712,7 +15712,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/snapgear/io.c linux-2.6.17/arch/sh } diff -ruN linux-2.6.17-vanilla/arch/sh/boards/snapgear/rtc.c linux-2.6.17/arch/sh/boards/snapgear/rtc.c --- linux-2.6.17-vanilla/arch/sh/boards/snapgear/rtc.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/snapgear/rtc.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/snapgear/rtc.c 2006-07-07 10:17:07.000000000 +0000 @@ -17,10 +17,7 @@ #include <linux/time.h> #include <linux/rtc.h> @@ -15726,7 +15726,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/snapgear/rtc.c linux-2.6.17/arch/s diff -ruN linux-2.6.17-vanilla/arch/sh/boards/snapgear/setup.c linux-2.6.17/arch/sh/boards/snapgear/setup.c --- linux-2.6.17-vanilla/arch/sh/boards/snapgear/setup.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/snapgear/setup.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/snapgear/setup.c 2006-07-07 10:17:07.000000000 +0000 @@ -1,5 +1,4 @@ -/****************************************************************************/ -/* @@ -15863,22 +15863,22 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/snapgear/setup.c linux-2.6.17/arch ALIAS_MV(snapgear) diff -ruN linux-2.6.17-vanilla/arch/sh/boards/superh/CVS/Entries linux-2.6.17/arch/sh/boards/superh/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/superh/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/superh/CVS/Entries 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/superh/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +D/microdev//// diff -ruN linux-2.6.17-vanilla/arch/sh/boards/superh/CVS/Repository linux-2.6.17/arch/sh/boards/superh/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/superh/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/superh/CVS/Repository 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/superh/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/superh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/superh/CVS/Root linux-2.6.17/arch/sh/boards/superh/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/superh/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/superh/CVS/Root 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/superh/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/superh/microdev/CVS/Entries linux-2.6.17/arch/sh/boards/superh/microdev/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/superh/microdev/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/superh/microdev/CVS/Entries 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/superh/microdev/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,6 @@ +/Makefile/1.1/Wed Aug 4 01:04:30 2004// +/io.c/1.3/Wed Jan 4 17:14:53 2006// @@ -15888,17 +15888,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/superh/microdev/CVS/Entries linux- +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/superh/microdev/CVS/Repository linux-2.6.17/arch/sh/boards/superh/microdev/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/superh/microdev/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/superh/microdev/CVS/Repository 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/superh/microdev/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/superh/microdev diff -ruN linux-2.6.17-vanilla/arch/sh/boards/superh/microdev/CVS/Root linux-2.6.17/arch/sh/boards/superh/microdev/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/superh/microdev/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/superh/microdev/CVS/Root 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/superh/microdev/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/superh/microdev/setup.c linux-2.6.17/arch/sh/boards/superh/microdev/setup.c --- linux-2.6.17-vanilla/arch/sh/boards/superh/microdev/setup.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/superh/microdev/setup.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/superh/microdev/setup.c 2006-07-07 10:17:07.000000000 +0000 @@ -398,7 +398,7 @@ /* enable the appropriate GPIO pins for IDE functionality: * bit[0] In/Out 1==input; 0==output @@ -15910,7 +15910,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/superh/microdev/setup.c linux-2.6. SMSC_WRITE_INDEXED(0x00, 0xc2); /* GP42 = nIDE1_OE */ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/titan/CVS/Entries linux-2.6.17/arch/sh/boards/titan/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/titan/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/titan/CVS/Entries 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/titan/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,4 @@ +/Makefile/1.1/Wed Nov 9 14:56:34 2005/-ko/ +/io.c/1.6/Sun Feb 5 21:55:29 2006/-ko/ @@ -15918,17 +15918,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/titan/CVS/Entries linux-2.6.17/arc +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/titan/CVS/Repository linux-2.6.17/arch/sh/boards/titan/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/titan/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/titan/CVS/Repository 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/titan/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/titan diff -ruN linux-2.6.17-vanilla/arch/sh/boards/titan/CVS/Root linux-2.6.17/arch/sh/boards/titan/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/titan/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/titan/CVS/Root 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/titan/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boards/titan/Makefile linux-2.6.17/arch/sh/boards/titan/Makefile --- linux-2.6.17-vanilla/arch/sh/boards/titan/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/titan/Makefile 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/titan/Makefile 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,5 @@ +# +# Makefile for the Nimble Microsystems TITAN specific parts of the kernel @@ -15937,7 +15937,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/titan/Makefile linux-2.6.17/arch/s +obj-y := setup.o io.o diff -ruN linux-2.6.17-vanilla/arch/sh/boards/titan/io.c linux-2.6.17/arch/sh/boards/titan/io.c --- linux-2.6.17-vanilla/arch/sh/boards/titan/io.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/titan/io.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/titan/io.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,126 @@ +/* + * I/O routines for Titan @@ -16067,7 +16067,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/titan/io.c linux-2.6.17/arch/sh/bo +} diff -ruN linux-2.6.17-vanilla/arch/sh/boards/titan/setup.c linux-2.6.17/arch/sh/boards/titan/setup.c --- linux-2.6.17-vanilla/arch/sh/boards/titan/setup.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/titan/setup.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/titan/setup.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,59 @@ +/* + * Setup for Titan @@ -16130,53 +16130,53 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/titan/setup.c linux-2.6.17/arch/sh +ALIAS_MV(titan) diff -ruN linux-2.6.17-vanilla/arch/sh/boards/unknown/CVS/Entries linux-2.6.17/arch/sh/boards/unknown/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boards/unknown/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/unknown/CVS/Entries 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/unknown/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,3 @@ +/Makefile/1.5/Tue Nov 8 19:55:58 2005// +/setup.c/1.3/Tue Nov 8 19:55:58 2005// +D diff -ruN linux-2.6.17-vanilla/arch/sh/boards/unknown/CVS/Repository linux-2.6.17/arch/sh/boards/unknown/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boards/unknown/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/unknown/CVS/Repository 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/unknown/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boards/unknown diff -ruN linux-2.6.17-vanilla/arch/sh/boards/unknown/CVS/Root linux-2.6.17/arch/sh/boards/unknown/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boards/unknown/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boards/unknown/CVS/Root 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boards/unknown/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boot/.cvsignore linux-2.6.17/arch/sh/boot/.cvsignore --- linux-2.6.17-vanilla/arch/sh/boot/.cvsignore 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boot/.cvsignore 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boot/.cvsignore 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +zImage diff -ruN linux-2.6.17-vanilla/arch/sh/boot/CVS/Entries linux-2.6.17/arch/sh/boot/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boot/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boot/CVS/Entries 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boot/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,3 @@ +/.cvsignore/1.1.1.1/Mon Oct 15 20:44:47 2001// +/Makefile/1.9/Wed Jun 16 15:21:46 2004/-ko/ +D/compressed//// diff -ruN linux-2.6.17-vanilla/arch/sh/boot/CVS/Repository linux-2.6.17/arch/sh/boot/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boot/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boot/CVS/Repository 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boot/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boot diff -ruN linux-2.6.17-vanilla/arch/sh/boot/CVS/Root linux-2.6.17/arch/sh/boot/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boot/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boot/CVS/Root 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boot/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/boot/compressed/.cvsignore linux-2.6.17/arch/sh/boot/compressed/.cvsignore --- linux-2.6.17-vanilla/arch/sh/boot/compressed/.cvsignore 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boot/compressed/.cvsignore 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boot/compressed/.cvsignore 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,3 @@ +vmlinux +vmlinux.bin +vmlinux.bin.gz diff -ruN linux-2.6.17-vanilla/arch/sh/boot/compressed/CVS/Entries linux-2.6.17/arch/sh/boot/compressed/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/boot/compressed/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boot/compressed/CVS/Entries 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boot/compressed/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,6 @@ +/.cvsignore/1.2/Sat May 10 03:22:05 2003// +/Makefile/1.13/Mon Oct 25 10:41:02 2004// @@ -16186,34 +16186,34 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boot/compressed/CVS/Entries linux-2.6.17/ +D diff -ruN linux-2.6.17-vanilla/arch/sh/boot/compressed/CVS/Repository linux-2.6.17/arch/sh/boot/compressed/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/boot/compressed/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boot/compressed/CVS/Repository 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boot/compressed/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/boot/compressed diff -ruN linux-2.6.17-vanilla/arch/sh/boot/compressed/CVS/Root linux-2.6.17/arch/sh/boot/compressed/CVS/Root --- linux-2.6.17-vanilla/arch/sh/boot/compressed/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/boot/compressed/CVS/Root 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/boot/compressed/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/CVS/Entries linux-2.6.17/arch/sh/cchips/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/cchips/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/cchips/CVS/Entries 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/cchips/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,3 @@ +/Kconfig/1.5/Wed Jan 4 16:34:31 2006// +D/hd6446x//// +D/voyagergx//// diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/CVS/Repository linux-2.6.17/arch/sh/cchips/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/cchips/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/cchips/CVS/Repository 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/cchips/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/cchips diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/CVS/Root linux-2.6.17/arch/sh/cchips/CVS/Root --- linux-2.6.17-vanilla/arch/sh/cchips/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/cchips/CVS/Root 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/cchips/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/Kconfig linux-2.6.17/arch/sh/cchips/Kconfig --- linux-2.6.17-vanilla/arch/sh/cchips/Kconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/cchips/Kconfig 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/cchips/Kconfig 2006-07-07 10:17:07.000000000 +0000 @@ -65,6 +65,11 @@ Do not change this unless you know what you are doing. @@ -16236,23 +16236,23 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/Kconfig linux-2.6.17/arch/sh/cchip depends on HD64465 diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/hd6446x/CVS/Entries linux-2.6.17/arch/sh/cchips/hd6446x/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/cchips/hd6446x/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/cchips/hd6446x/CVS/Entries 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/cchips/hd6446x/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,2 @@ +D/hd64461//// +D/hd64465//// diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/hd6446x/CVS/Repository linux-2.6.17/arch/sh/cchips/hd6446x/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/cchips/hd6446x/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/cchips/hd6446x/CVS/Repository 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/cchips/hd6446x/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/cchips/hd6446x diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/hd6446x/CVS/Root linux-2.6.17/arch/sh/cchips/hd6446x/CVS/Root --- linux-2.6.17-vanilla/arch/sh/cchips/hd6446x/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/cchips/hd6446x/CVS/Root 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/cchips/hd6446x/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/hd6446x/hd64461/CVS/Entries linux-2.6.17/arch/sh/cchips/hd6446x/hd64461/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/cchips/hd6446x/hd64461/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/cchips/hd6446x/hd64461/CVS/Entries 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/cchips/hd6446x/hd64461/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,4 @@ +/Makefile/1.4/Thu Mar 11 18:08:03 2004// +/io.c/1.8/Sun Feb 5 21:55:29 2006// @@ -16260,17 +16260,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/hd6446x/hd64461/CVS/Entries linux- +D diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/hd6446x/hd64461/CVS/Repository linux-2.6.17/arch/sh/cchips/hd6446x/hd64461/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/cchips/hd6446x/hd64461/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/cchips/hd6446x/hd64461/CVS/Repository 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/cchips/hd6446x/hd64461/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/cchips/hd6446x/hd64461 diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/hd6446x/hd64461/CVS/Root linux-2.6.17/arch/sh/cchips/hd6446x/hd64461/CVS/Root --- linux-2.6.17-vanilla/arch/sh/cchips/hd6446x/hd64461/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/cchips/hd6446x/hd64461/CVS/Root 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/cchips/hd6446x/hd64461/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/hd6446x/hd64461/io.c linux-2.6.17/arch/sh/cchips/hd6446x/hd64461/io.c --- linux-2.6.17-vanilla/arch/sh/cchips/hd6446x/hd64461/io.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/cchips/hd6446x/hd64461/io.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/cchips/hd6446x/hd64461/io.c 2006-07-07 10:17:07.000000000 +0000 @@ -1,12 +1,12 @@ /* - * $Id: io.c,v 1.6 2004/03/16 00:07:50 lethal Exp $ @@ -16336,7 +16336,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/hd6446x/hd64461/io.c linux-2.6.17/ diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/hd6446x/hd64461/setup.c linux-2.6.17/arch/sh/cchips/hd6446x/hd64461/setup.c --- linux-2.6.17-vanilla/arch/sh/cchips/hd6446x/hd64461/setup.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/cchips/hd6446x/hd64461/setup.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/cchips/hd6446x/hd64461/setup.c 2006-07-07 10:17:07.000000000 +0000 @@ -15,8 +15,7 @@ #include <asm/io.h> @@ -16349,7 +16349,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/hd6446x/hd64461/setup.c linux-2.6. { diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/hd6446x/hd64465/CVS/Entries linux-2.6.17/arch/sh/cchips/hd6446x/hd64465/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/cchips/hd6446x/hd64465/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/cchips/hd6446x/hd64465/CVS/Entries 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/cchips/hd6446x/hd64465/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,5 @@ +/Makefile/1.4/Thu Mar 11 18:08:03 2004// +/gpio.c/1.4/Mon May 19 22:24:18 2003// @@ -16358,17 +16358,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/hd6446x/hd64465/CVS/Entries linux- +D diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/hd6446x/hd64465/CVS/Repository linux-2.6.17/arch/sh/cchips/hd6446x/hd64465/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/cchips/hd6446x/hd64465/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/cchips/hd6446x/hd64465/CVS/Repository 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/cchips/hd6446x/hd64465/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/cchips/hd6446x/hd64465 diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/hd6446x/hd64465/CVS/Root linux-2.6.17/arch/sh/cchips/hd6446x/hd64465/CVS/Root --- linux-2.6.17-vanilla/arch/sh/cchips/hd6446x/hd64465/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/cchips/hd6446x/hd64465/CVS/Root 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/cchips/hd6446x/hd64465/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/voyagergx/CVS/Entries linux-2.6.17/arch/sh/cchips/voyagergx/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/cchips/voyagergx/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/cchips/voyagergx/CVS/Entries 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/cchips/voyagergx/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,5 @@ +/Makefile/1.2/Tue May 31 14:33:28 2005/-ko/ +/consistent.c/1.5/Fri Jan 27 16:11:52 2006/-ko/ @@ -16377,17 +16377,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/voyagergx/CVS/Entries linux-2.6.17 +D diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/voyagergx/CVS/Repository linux-2.6.17/arch/sh/cchips/voyagergx/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/cchips/voyagergx/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/cchips/voyagergx/CVS/Repository 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/cchips/voyagergx/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/cchips/voyagergx diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/voyagergx/CVS/Root linux-2.6.17/arch/sh/cchips/voyagergx/CVS/Root --- linux-2.6.17-vanilla/arch/sh/cchips/voyagergx/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/cchips/voyagergx/CVS/Root 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/cchips/voyagergx/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/voyagergx/Makefile linux-2.6.17/arch/sh/cchips/voyagergx/Makefile --- linux-2.6.17-vanilla/arch/sh/cchips/voyagergx/Makefile 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/cchips/voyagergx/Makefile 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/cchips/voyagergx/Makefile 2006-07-07 10:17:07.000000000 +0000 @@ -4,5 +4,5 @@ obj-y := irq.o setup.o @@ -16397,7 +16397,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/voyagergx/Makefile linux-2.6.17/ar diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/voyagergx/irq.c linux-2.6.17/arch/sh/cchips/voyagergx/irq.c --- linux-2.6.17-vanilla/arch/sh/cchips/voyagergx/irq.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/cchips/voyagergx/irq.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/cchips/voyagergx/irq.c 2006-07-07 10:17:07.000000000 +0000 @@ -33,8 +33,7 @@ #include <asm/io.h> @@ -16410,7 +16410,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/voyagergx/irq.c linux-2.6.17/arch/ { diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/voyagergx/setup.c linux-2.6.17/arch/sh/cchips/voyagergx/setup.c --- linux-2.6.17-vanilla/arch/sh/cchips/voyagergx/setup.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/cchips/voyagergx/setup.c 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/cchips/voyagergx/setup.c 2006-07-07 10:17:07.000000000 +0000 @@ -13,7 +13,7 @@ #include <linux/init.h> #include <linux/module.h> @@ -16422,7 +16422,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/cchips/voyagergx/setup.c linux-2.6.17/arc { diff -ruN linux-2.6.17-vanilla/arch/sh/configs/CVS/Entries linux-2.6.17/arch/sh/configs/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/configs/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/configs/CVS/Entries 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/configs/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,19 @@ +/adx_defconfig/1.3/Wed Oct 5 21:34:14 2005// +/cqreek_defconfig/1.3/Wed Oct 5 21:34:14 2005// @@ -16439,23 +16439,23 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/CVS/Entries linux-2.6.17/arch/sh/ +/sh03_defconfig/1.4/Wed Jan 4 19:03:16 2006/-ko/ +/snapgear_defconfig/1.5/Wed Jan 4 19:03:16 2006// +/systemh_defconfig/1.4/Wed Jan 4 19:03:16 2006// -+/titan_defconfig/1.2/Wed Jan 4 19:03:16 2006/-ko/ +/r7780rp_defconfig/1.2/Wed Jul 5 14:50:34 2006/-ko/ +/hp6xx_defconfig/1.8/Thu Jul 6 12:38:07 2006/-ko/ ++/titan_defconfig/1.3/Thu Jul 6 18:40:37 2006/-ko/ +D diff -ruN linux-2.6.17-vanilla/arch/sh/configs/CVS/Repository linux-2.6.17/arch/sh/configs/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/configs/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/configs/CVS/Repository 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/configs/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/configs diff -ruN linux-2.6.17-vanilla/arch/sh/configs/CVS/Root linux-2.6.17/arch/sh/configs/CVS/Root --- linux-2.6.17-vanilla/arch/sh/configs/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/configs/CVS/Root 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/configs/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/configs/adx_defconfig linux-2.6.17/arch/sh/configs/adx_defconfig --- linux-2.6.17-vanilla/arch/sh/configs/adx_defconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/configs/adx_defconfig 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/configs/adx_defconfig 2006-07-07 10:17:07.000000000 +0000 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit @@ -16825,7 +16825,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/adx_defconfig linux-2.6.17/arch/s # CONFIG_EARLY_SCIF_CONSOLE is not set diff -ruN linux-2.6.17-vanilla/arch/sh/configs/cqreek_defconfig linux-2.6.17/arch/sh/configs/cqreek_defconfig --- linux-2.6.17-vanilla/arch/sh/configs/cqreek_defconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/configs/cqreek_defconfig 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/configs/cqreek_defconfig 2006-07-07 10:17:07.000000000 +0000 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit @@ -17190,7 +17190,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/cqreek_defconfig linux-2.6.17/arc # CONFIG_EARLY_PRINTK is not set diff -ruN linux-2.6.17-vanilla/arch/sh/configs/dreamcast_defconfig linux-2.6.17/arch/sh/configs/dreamcast_defconfig --- linux-2.6.17-vanilla/arch/sh/configs/dreamcast_defconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/configs/dreamcast_defconfig 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/configs/dreamcast_defconfig 2006-07-07 10:17:07.000000000 +0000 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit @@ -17986,7 +17986,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/dreamcast_defconfig linux-2.6.17/ -CONFIG_ZLIB_INFLATE=y diff -ruN linux-2.6.17-vanilla/arch/sh/configs/hp6xx_defconfig linux-2.6.17/arch/sh/configs/hp6xx_defconfig --- linux-2.6.17-vanilla/arch/sh/configs/hp6xx_defconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/configs/hp6xx_defconfig 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/configs/hp6xx_defconfig 2006-07-07 10:17:07.000000000 +0000 @@ -1,11 +1,12 @@ # # Automatically generated make config: don't edit @@ -18289,7 +18289,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/hp6xx_defconfig linux-2.6.17/arch diff -ruN linux-2.6.17-vanilla/arch/sh/configs/hs7751rvoip_defconfig linux-2.6.17/arch/sh/configs/hs7751rvoip_defconfig --- linux-2.6.17-vanilla/arch/sh/configs/hs7751rvoip_defconfig 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/configs/hs7751rvoip_defconfig 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/configs/hs7751rvoip_defconfig 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,884 @@ +# +# Automatically generated make config: don't edit @@ -19177,7 +19177,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/hs7751rvoip_defconfig linux-2.6.1 +# CONFIG_LIBCRC32C is not set diff -ruN linux-2.6.17-vanilla/arch/sh/configs/landisk_defconfig linux-2.6.17/arch/sh/configs/landisk_defconfig --- linux-2.6.17-vanilla/arch/sh/configs/landisk_defconfig 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/configs/landisk_defconfig 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/configs/landisk_defconfig 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,1372 @@ +# +# Automatically generated make config: don't edit @@ -20553,7 +20553,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/landisk_defconfig linux-2.6.17/ar +# CONFIG_LIBCRC32C is not set diff -ruN linux-2.6.17-vanilla/arch/sh/configs/microdev_defconfig linux-2.6.17/arch/sh/configs/microdev_defconfig --- linux-2.6.17-vanilla/arch/sh/configs/microdev_defconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/configs/microdev_defconfig 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/configs/microdev_defconfig 2006-07-07 10:17:07.000000000 +0000 @@ -1,9 +1,10 @@ # # Automatically generated make config: don't edit @@ -20751,7 +20751,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/microdev_defconfig linux-2.6.17/a # CONFIG_KGDB is not set diff -ruN linux-2.6.17-vanilla/arch/sh/configs/r7780rp_defconfig linux-2.6.17/arch/sh/configs/r7780rp_defconfig --- linux-2.6.17-vanilla/arch/sh/configs/r7780rp_defconfig 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/configs/r7780rp_defconfig 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/configs/r7780rp_defconfig 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,1140 @@ +# +# Automatically generated make config: don't edit @@ -21895,7 +21895,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/r7780rp_defconfig linux-2.6.17/ar +# CONFIG_LIBCRC32C is not set diff -ruN linux-2.6.17-vanilla/arch/sh/configs/rts7751r2d_defconfig linux-2.6.17/arch/sh/configs/rts7751r2d_defconfig --- linux-2.6.17-vanilla/arch/sh/configs/rts7751r2d_defconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/configs/rts7751r2d_defconfig 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/configs/rts7751r2d_defconfig 2006-07-07 10:17:07.000000000 +0000 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit @@ -22637,7 +22637,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/rts7751r2d_defconfig linux-2.6.17 # CONFIG_LIBCRC32C is not set diff -ruN linux-2.6.17-vanilla/arch/sh/configs/se7300_defconfig linux-2.6.17/arch/sh/configs/se7300_defconfig --- linux-2.6.17-vanilla/arch/sh/configs/se7300_defconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/configs/se7300_defconfig 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/configs/se7300_defconfig 2006-07-07 10:17:07.000000000 +0000 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit @@ -23097,7 +23097,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/se7300_defconfig linux-2.6.17/arc # CONFIG_LIBCRC32C is not set diff -ruN linux-2.6.17-vanilla/arch/sh/configs/se73180_defconfig linux-2.6.17/arch/sh/configs/se73180_defconfig --- linux-2.6.17-vanilla/arch/sh/configs/se73180_defconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/configs/se73180_defconfig 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/configs/se73180_defconfig 2006-07-07 10:17:07.000000000 +0000 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit @@ -23561,7 +23561,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/se73180_defconfig linux-2.6.17/ar # CONFIG_LIBCRC32C is not set diff -ruN linux-2.6.17-vanilla/arch/sh/configs/se7705_defconfig linux-2.6.17/arch/sh/configs/se7705_defconfig --- linux-2.6.17-vanilla/arch/sh/configs/se7705_defconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/configs/se7705_defconfig 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/configs/se7705_defconfig 2006-07-07 10:17:07.000000000 +0000 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit @@ -24259,7 +24259,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/se7705_defconfig linux-2.6.17/arc CONFIG_ZLIB_INFLATE=y diff -ruN linux-2.6.17-vanilla/arch/sh/configs/se7750_defconfig linux-2.6.17/arch/sh/configs/se7750_defconfig --- linux-2.6.17-vanilla/arch/sh/configs/se7750_defconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/configs/se7750_defconfig 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/configs/se7750_defconfig 2006-07-07 10:17:07.000000000 +0000 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit @@ -24933,7 +24933,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/se7750_defconfig linux-2.6.17/arc CONFIG_ZLIB_INFLATE=y diff -ruN linux-2.6.17-vanilla/arch/sh/configs/se7751_defconfig linux-2.6.17/arch/sh/configs/se7751_defconfig --- linux-2.6.17-vanilla/arch/sh/configs/se7751_defconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/configs/se7751_defconfig 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/configs/se7751_defconfig 2006-07-07 10:17:07.000000000 +0000 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit @@ -25682,7 +25682,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/se7751_defconfig linux-2.6.17/arc CONFIG_ZLIB_INFLATE=y diff -ruN linux-2.6.17-vanilla/arch/sh/configs/sh03_defconfig linux-2.6.17/arch/sh/configs/sh03_defconfig --- linux-2.6.17-vanilla/arch/sh/configs/sh03_defconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/configs/sh03_defconfig 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/configs/sh03_defconfig 2006-07-07 10:17:07.000000000 +0000 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit @@ -26452,7 +26452,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/sh03_defconfig linux-2.6.17/arch/ CONFIG_ZLIB_INFLATE=y diff -ruN linux-2.6.17-vanilla/arch/sh/configs/snapgear_defconfig linux-2.6.17/arch/sh/configs/snapgear_defconfig --- linux-2.6.17-vanilla/arch/sh/configs/snapgear_defconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/configs/snapgear_defconfig 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/configs/snapgear_defconfig 2006-07-07 10:17:07.000000000 +0000 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit @@ -27143,7 +27143,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/snapgear_defconfig linux-2.6.17/a CONFIG_ZLIB_INFLATE=y diff -ruN linux-2.6.17-vanilla/arch/sh/configs/systemh_defconfig linux-2.6.17/arch/sh/configs/systemh_defconfig --- linux-2.6.17-vanilla/arch/sh/configs/systemh_defconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/configs/systemh_defconfig 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/configs/systemh_defconfig 2006-07-07 10:17:07.000000000 +0000 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit @@ -27612,16 +27612,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/systemh_defconfig linux-2.6.17/ar CONFIG_ZLIB_INFLATE=y diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch/sh/configs/titan_defconfig --- linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/configs/titan_defconfig 2006-07-06 12:42:55.000000000 +0000 -@@ -0,0 +1,1399 @@ ++++ linux-2.6.17/arch/sh/configs/titan_defconfig 2006-07-07 10:17:07.000000000 +0000 +@@ -0,0 +1,1551 @@ +# +# Automatically generated make config: don't edit -+# Linux kernel version: 2.6.15-sh -+# Wed Jan 4 20:54:24 2006 ++# Linux kernel version: 2.6.17 ++# Thu Jul 6 12:42:07 2006 +# +CONFIG_SUPERH=y -+CONFIG_UID16=y +CONFIG_RWSEM_GENERIC_SPINLOCK=y ++CONFIG_GENERIC_FIND_NEXT_BIT=y ++CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_CALIBRATE_DELAY=y @@ -27630,7 +27631,6 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# Code maturity level options +# +CONFIG_EXPERIMENTAL=y -+CONFIG_CLEAN_COMPILE=y +CONFIG_BROKEN_ON_SMP=y +CONFIG_INIT_ENV_ARG_LIMIT=32 + @@ -27641,32 +27641,33 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +CONFIG_LOCALVERSION_AUTO=y +CONFIG_SWAP=y +CONFIG_SYSVIPC=y -+# CONFIG_POSIX_MQUEUE is not set ++CONFIG_POSIX_MQUEUE=y +# CONFIG_BSD_PROCESS_ACCT is not set +CONFIG_SYSCTL=y +# CONFIG_AUDIT is not set -+CONFIG_HOTPLUG=y -+CONFIG_KOBJECT_UEVENT=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y ++# CONFIG_RELAY is not set +CONFIG_INITRAMFS_SOURCE="" -+CONFIG_CC_OPTIMIZE_FOR_SIZE=y ++CONFIG_UID16=y ++# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +# CONFIG_EMBEDDED is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_ALL is not set +# CONFIG_KALLSYMS_EXTRA_PASS is not set ++CONFIG_HOTPLUG=y +CONFIG_PRINTK=y +CONFIG_BUG=y ++CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_EPOLL=y +CONFIG_SHMEM=y -+CONFIG_CC_ALIGN_FUNCTIONS=0 -+CONFIG_CC_ALIGN_LABELS=0 -+CONFIG_CC_ALIGN_LOOPS=0 -+CONFIG_CC_ALIGN_JUMPS=0 ++CONFIG_SLAB=y +# CONFIG_TINY_SHMEM is not set +CONFIG_BASE_SMALL=0 ++# CONFIG_SLOB is not set ++CONFIG_OBSOLETE_INTERMODULE=m + +# +# Loadable module support @@ -27674,7 +27675,6 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y -+CONFIG_OBSOLETE_MODPARM=y +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +CONFIG_KMOD=y @@ -27683,6 +27683,8 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# Block layer +# +# CONFIG_LBD is not set ++# CONFIG_BLK_DEV_IO_TRACE is not set ++# CONFIG_LSF is not set + +# +# IO Schedulers @@ -27722,6 +27724,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# CONFIG_SH_SECUREEDGE5410 is not set +# CONFIG_SH_HS7751RVOIP is not set +# CONFIG_SH_RTS7751R2D is not set ++# CONFIG_SH_R7780RP is not set +# CONFIG_SH_EDOSK7705 is not set +# CONFIG_SH_SH4202_MICRODEV is not set +# CONFIG_SH_LANDISK is not set @@ -27801,12 +27804,13 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +CONFIG_SH_RTC=y +CONFIG_SH_FPU=y +# CONFIG_SH_STORE_QUEUES is not set ++CONFIG_CPU_HAS_INTEVT=y ++CONFIG_CPU_HAS_SR_RB=y + +# +# Timer support +# +CONFIG_SH_TMU=y -+CONFIG_SH_PCLK_FREQ_BOOL=y +CONFIG_SH_PCLK_FREQ=30000000 + +# @@ -27849,7 +27853,6 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +CONFIG_SH_PCIDMA_NONCOHERENT=y +CONFIG_PCI_AUTO=y +CONFIG_PCI_AUTO_UPDATE_RESOURCES=y -+CONFIG_PCI_LEGACY_PROC=y +# CONFIG_PCI_DEBUG is not set + +# @@ -27873,6 +27876,11 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# CONFIG_BINFMT_MISC is not set + +# ++# Power management options (EXPERIMENTAL) ++# ++# CONFIG_PM is not set ++ ++# +# Networking +# +CONFIG_NET=y @@ -27880,6 +27888,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# +# Networking options +# ++# CONFIG_NETDEBUG is not set +CONFIG_PACKET=y +CONFIG_PACKET_MMAP=y +CONFIG_UNIX=y @@ -27905,18 +27914,19 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +CONFIG_IP_PNP_RARP=y -+CONFIG_NET_IPIP=m -+CONFIG_NET_IPGRE=m ++CONFIG_NET_IPIP=y ++CONFIG_NET_IPGRE=y +CONFIG_NET_IPGRE_BROADCAST=y +CONFIG_IP_MROUTE=y +CONFIG_IP_PIMSM_V1=y +CONFIG_IP_PIMSM_V2=y +# CONFIG_ARPD is not set +CONFIG_SYN_COOKIES=y -+CONFIG_INET_AH=m -+CONFIG_INET_ESP=m -+CONFIG_INET_IPCOMP=m -+CONFIG_INET_TUNNEL=m ++CONFIG_INET_AH=y ++CONFIG_INET_ESP=y ++CONFIG_INET_IPCOMP=y ++CONFIG_INET_XFRM_TUNNEL=y ++CONFIG_INET_TUNNEL=y +CONFIG_INET_DIAG=m +CONFIG_INET_TCP_DIAG=m +# CONFIG_TCP_CONG_ADVANCED is not set @@ -27926,13 +27936,15 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# IP: Virtual Server Configuration +# +# CONFIG_IP_VS is not set -+CONFIG_IPV6=m ++CONFIG_IPV6=y +CONFIG_IPV6_PRIVACY=y -+CONFIG_INET6_AH=m -+CONFIG_INET6_ESP=m -+CONFIG_INET6_IPCOMP=m -+CONFIG_INET6_TUNNEL=m -+CONFIG_IPV6_TUNNEL=m ++# CONFIG_IPV6_ROUTER_PREF is not set ++CONFIG_INET6_AH=y ++CONFIG_INET6_ESP=y ++CONFIG_INET6_IPCOMP=y ++CONFIG_INET6_XFRM_TUNNEL=y ++CONFIG_INET6_TUNNEL=y ++CONFIG_IPV6_TUNNEL=y +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set +CONFIG_BRIDGE_NETFILTER=y @@ -27943,6 +27955,32 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +CONFIG_NETFILTER_NETLINK=m +CONFIG_NETFILTER_NETLINK_QUEUE=m +CONFIG_NETFILTER_NETLINK_LOG=m ++CONFIG_NETFILTER_XTABLES=m ++CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m ++CONFIG_NETFILTER_XT_TARGET_CONNMARK=m ++CONFIG_NETFILTER_XT_TARGET_MARK=m ++CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m ++CONFIG_NETFILTER_XT_TARGET_NOTRACK=m ++CONFIG_NETFILTER_XT_MATCH_COMMENT=m ++CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m ++CONFIG_NETFILTER_XT_MATCH_CONNMARK=m ++CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m ++CONFIG_NETFILTER_XT_MATCH_DCCP=m ++CONFIG_NETFILTER_XT_MATCH_ESP=m ++CONFIG_NETFILTER_XT_MATCH_HELPER=m ++CONFIG_NETFILTER_XT_MATCH_LENGTH=m ++CONFIG_NETFILTER_XT_MATCH_LIMIT=m ++CONFIG_NETFILTER_XT_MATCH_MAC=m ++CONFIG_NETFILTER_XT_MATCH_MARK=m ++CONFIG_NETFILTER_XT_MATCH_POLICY=m ++CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m ++CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m ++CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m ++CONFIG_NETFILTER_XT_MATCH_REALM=m ++CONFIG_NETFILTER_XT_MATCH_SCTP=m ++CONFIG_NETFILTER_XT_MATCH_STATE=m ++CONFIG_NETFILTER_XT_MATCH_STRING=m ++CONFIG_NETFILTER_XT_MATCH_TCPMSS=m + +# +# IP: Netfilter Configuration @@ -27959,42 +27997,24 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +CONFIG_IP_NF_TFTP=m +# CONFIG_IP_NF_AMANDA is not set +CONFIG_IP_NF_PPTP=m ++CONFIG_IP_NF_H323=m +CONFIG_IP_NF_QUEUE=m +CONFIG_IP_NF_IPTABLES=m -+CONFIG_IP_NF_MATCH_LIMIT=m +CONFIG_IP_NF_MATCH_IPRANGE=m -+CONFIG_IP_NF_MATCH_MAC=m -+CONFIG_IP_NF_MATCH_PKTTYPE=m -+CONFIG_IP_NF_MATCH_MARK=m -+CONFIG_IP_NF_MATCH_MULTIPORT=m +CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_RECENT=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_DSCP=m -+CONFIG_IP_NF_MATCH_AH_ESP=m -+CONFIG_IP_NF_MATCH_LENGTH=m ++CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_TTL=m -+CONFIG_IP_NF_MATCH_TCPMSS=m -+CONFIG_IP_NF_MATCH_HELPER=m -+CONFIG_IP_NF_MATCH_STATE=m -+CONFIG_IP_NF_MATCH_CONNTRACK=m +CONFIG_IP_NF_MATCH_OWNER=m -+# CONFIG_IP_NF_MATCH_PHYSDEV is not set +CONFIG_IP_NF_MATCH_ADDRTYPE=m -+CONFIG_IP_NF_MATCH_REALM=m -+# CONFIG_IP_NF_MATCH_SCTP is not set -+# CONFIG_IP_NF_MATCH_DCCP is not set -+CONFIG_IP_NF_MATCH_COMMENT=m -+CONFIG_IP_NF_MATCH_CONNMARK=m -+CONFIG_IP_NF_MATCH_CONNBYTES=m +CONFIG_IP_NF_MATCH_HASHLIMIT=m -+CONFIG_IP_NF_MATCH_STRING=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_LOG=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_IP_NF_TARGET_TCPMSS=m -+CONFIG_IP_NF_TARGET_NFQUEUE=m +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_NAT_NEEDED=y +CONFIG_IP_NF_TARGET_MASQUERADE=m @@ -28006,17 +28026,14 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +CONFIG_IP_NF_NAT_FTP=m +CONFIG_IP_NF_NAT_TFTP=m +CONFIG_IP_NF_NAT_PPTP=m ++CONFIG_IP_NF_NAT_H323=m +CONFIG_IP_NF_MANGLE=m +CONFIG_IP_NF_TARGET_TOS=m +CONFIG_IP_NF_TARGET_ECN=m +CONFIG_IP_NF_TARGET_DSCP=m -+CONFIG_IP_NF_TARGET_MARK=m -+CONFIG_IP_NF_TARGET_CLASSIFY=m +CONFIG_IP_NF_TARGET_TTL=m -+CONFIG_IP_NF_TARGET_CONNMARK=m +CONFIG_IP_NF_TARGET_CLUSTERIP=m +CONFIG_IP_NF_RAW=m -+CONFIG_IP_NF_TARGET_NOTRACK=m +CONFIG_IP_NF_ARPTABLES=m +CONFIG_IP_NF_ARPFILTER=m +CONFIG_IP_NF_ARP_MANGLE=m @@ -28026,26 +28043,18 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# +CONFIG_IP6_NF_QUEUE=m +CONFIG_IP6_NF_IPTABLES=m -+CONFIG_IP6_NF_MATCH_LIMIT=m -+CONFIG_IP6_NF_MATCH_MAC=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_MATCH_OPTS=m +CONFIG_IP6_NF_MATCH_FRAG=m +CONFIG_IP6_NF_MATCH_HL=m -+CONFIG_IP6_NF_MATCH_MULTIPORT=m +CONFIG_IP6_NF_MATCH_OWNER=m -+CONFIG_IP6_NF_MATCH_MARK=m +CONFIG_IP6_NF_MATCH_IPV6HEADER=m -+CONFIG_IP6_NF_MATCH_AHESP=m -+CONFIG_IP6_NF_MATCH_LENGTH=m ++CONFIG_IP6_NF_MATCH_AH=m +CONFIG_IP6_NF_MATCH_EUI64=m -+# CONFIG_IP6_NF_MATCH_PHYSDEV is not set +CONFIG_IP6_NF_FILTER=m +CONFIG_IP6_NF_TARGET_LOG=m +CONFIG_IP6_NF_TARGET_REJECT=m -+CONFIG_IP6_NF_TARGET_NFQUEUE=m +CONFIG_IP6_NF_MANGLE=m -+CONFIG_IP6_NF_TARGET_MARK=m +CONFIG_IP6_NF_TARGET_HL=m +CONFIG_IP6_NF_RAW=m + @@ -28063,10 +28072,16 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# SCTP Configuration (EXPERIMENTAL) +# +# CONFIG_IP_SCTP is not set ++ ++# ++# TIPC Configuration (EXPERIMENTAL) ++# ++# CONFIG_TIPC is not set +# CONFIG_ATM is not set -+CONFIG_BRIDGE=m -+CONFIG_VLAN_8021Q=m ++CONFIG_BRIDGE=y ++CONFIG_VLAN_8021Q=y +# CONFIG_DECNET is not set ++CONFIG_LLC=y +# CONFIG_LLC2 is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set @@ -28139,7 +28154,14 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# CONFIG_HAMRADIO is not set +# CONFIG_IRDA is not set +# CONFIG_BT is not set -+# CONFIG_IEEE80211 is not set ++CONFIG_IEEE80211=y ++# CONFIG_IEEE80211_DEBUG is not set ++CONFIG_IEEE80211_CRYPT_WEP=y ++CONFIG_IEEE80211_CRYPT_CCMP=y ++CONFIG_IEEE80211_CRYPT_TKIP=y ++CONFIG_IEEE80211_SOFTMAC=m ++# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set ++CONFIG_WIRELESS_EXT=y + +# +# Device Drivers @@ -28161,7 +28183,85 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# +# Memory Technology Devices (MTD) +# -+# CONFIG_MTD is not set ++CONFIG_MTD=m ++CONFIG_MTD_DEBUG=y ++CONFIG_MTD_DEBUG_VERBOSE=0 ++# CONFIG_MTD_CONCAT is not set ++# CONFIG_MTD_PARTITIONS is not set ++ ++# ++# User Modules And Translation Layers ++# ++CONFIG_MTD_CHAR=m ++CONFIG_MTD_BLOCK=m ++# CONFIG_MTD_BLOCK_RO is not set ++CONFIG_FTL=m ++CONFIG_NFTL=m ++# CONFIG_NFTL_RW is not set ++CONFIG_INFTL=m ++CONFIG_RFD_FTL=m ++ ++# ++# RAM/ROM/Flash chip drivers ++# ++CONFIG_MTD_CFI=m ++CONFIG_MTD_JEDECPROBE=m ++CONFIG_MTD_GEN_PROBE=m ++# CONFIG_MTD_CFI_ADV_OPTIONS is not set ++CONFIG_MTD_MAP_BANK_WIDTH_1=y ++CONFIG_MTD_MAP_BANK_WIDTH_2=y ++CONFIG_MTD_MAP_BANK_WIDTH_4=y ++# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set ++# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set ++# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set ++CONFIG_MTD_CFI_I1=y ++CONFIG_MTD_CFI_I2=y ++# CONFIG_MTD_CFI_I4 is not set ++# CONFIG_MTD_CFI_I8 is not set ++# CONFIG_MTD_CFI_INTELEXT is not set ++# CONFIG_MTD_CFI_AMDSTD is not set ++# CONFIG_MTD_CFI_STAA is not set ++# CONFIG_MTD_RAM is not set ++# CONFIG_MTD_ROM is not set ++# CONFIG_MTD_ABSENT is not set ++# CONFIG_MTD_OBSOLETE_CHIPS is not set ++ ++# ++# Mapping drivers for chip access ++# ++# CONFIG_MTD_COMPLEX_MAPPINGS is not set ++# CONFIG_MTD_PHYSMAP is not set ++# CONFIG_MTD_SOLUTIONENGINE is not set ++# CONFIG_MTD_PLATRAM is not set ++ ++# ++# Self-contained MTD device drivers ++# ++# CONFIG_MTD_PMC551 is not set ++# CONFIG_MTD_SLRAM is not set ++# CONFIG_MTD_PHRAM is not set ++# CONFIG_MTD_MTDRAM is not set ++# CONFIG_MTD_BLOCK2MTD is not set ++ ++# ++# Disk-On-Chip Device Drivers ++# ++# CONFIG_MTD_DOC2000 is not set ++# CONFIG_MTD_DOC2001 is not set ++# CONFIG_MTD_DOC2001PLUS is not set ++ ++# ++# NAND Flash Device Drivers ++# ++CONFIG_MTD_NAND=m ++# CONFIG_MTD_NAND_VERIFY_WRITE is not set ++CONFIG_MTD_NAND_IDS=m ++# CONFIG_MTD_NAND_DISKONCHIP is not set ++ ++# ++# OneNAND Flash Device Drivers ++# ++# CONFIG_MTD_ONENAND is not set + +# +# Parallel port support @@ -28178,10 +28278,11 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# CONFIG_BLK_CPQ_DA is not set +# CONFIG_BLK_CPQ_CISS_DA is not set +# CONFIG_BLK_DEV_DAC960 is not set ++CONFIG_BLK_SSFDC=y +# CONFIG_BLK_DEV_UMEM is not set +# CONFIG_BLK_DEV_COW_COMMON is not set +CONFIG_BLK_DEV_LOOP=m -+# CONFIG_BLK_DEV_CRYPTOLOOP is not set ++CONFIG_BLK_DEV_CRYPTOLOOP=m +# CONFIG_BLK_DEV_NBD is not set +# CONFIG_BLK_DEV_SX8 is not set +# CONFIG_BLK_DEV_UB is not set @@ -28190,7 +28291,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_INITRD=y +# CONFIG_CDROM_PKTCDVD is not set -+# CONFIG_ATA_OVER_ETH is not set ++CONFIG_ATA_OVER_ETH=m + +# +# ATA/ATAPI/MFM/RLL support @@ -28201,7 +28302,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# SCSI device support +# +# CONFIG_RAID_ATTRS is not set -+CONFIG_SCSI=m ++CONFIG_SCSI=y +CONFIG_SCSI_PROC_FS=y + +# @@ -28253,15 +28354,8 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_IPR is not set -+# CONFIG_SCSI_QLOGIC_FC is not set +# CONFIG_SCSI_QLOGIC_1280 is not set -+CONFIG_SCSI_QLA2XXX=m -+# CONFIG_SCSI_QLA21XX is not set -+# CONFIG_SCSI_QLA22XX is not set -+# CONFIG_SCSI_QLA2300 is not set -+# CONFIG_SCSI_QLA2322 is not set -+# CONFIG_SCSI_QLA6312 is not set -+# CONFIG_SCSI_QLA24XX is not set ++# CONFIG_SCSI_QLA_FC is not set +# CONFIG_SCSI_LPFC is not set +# CONFIG_SCSI_DC395x is not set +# CONFIG_SCSI_DC390T is not set @@ -28295,6 +28389,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# Network device support +# +CONFIG_NETDEVICES=y ++# CONFIG_IFB is not set +# CONFIG_DUMMY is not set +# CONFIG_BONDING is not set +# CONFIG_EQUALIZER is not set @@ -28327,7 +28422,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# CONFIG_STNIC is not set +# CONFIG_HAPPYMEAL is not set +# CONFIG_SUNGEM is not set -+CONFIG_CASSINI=m ++# CONFIG_CASSINI is not set +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_SMC91X is not set + @@ -28373,6 +28468,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# CONFIG_R8169 is not set +# CONFIG_SIS190 is not set +# CONFIG_SKGE is not set ++# CONFIG_SKY2 is not set +# CONFIG_SK98LIN is not set +# CONFIG_VIA_VELOCITY is not set +# CONFIG_TIGON3 is not set @@ -28394,6 +28490,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# Wireless LAN (non-hamradio) +# +CONFIG_NET_RADIO=y ++CONFIG_NET_WIRELESS_RTNETLINK=y + +# +# Obsolete Wireless cards support (pre-802.11) @@ -28403,6 +28500,8 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# +# Wireless 802.11b ISA/PCI cards support +# ++# CONFIG_IPW2100 is not set ++# CONFIG_IPW2200 is not set +# CONFIG_HERMES is not set +# CONFIG_ATMEL is not set + @@ -28411,6 +28510,13 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# +CONFIG_PRISM54=m +# CONFIG_HOSTAP is not set ++CONFIG_BCM43XX=m ++CONFIG_BCM43XX_DEBUG=y ++CONFIG_BCM43XX_DMA=y ++CONFIG_BCM43XX_PIO=y ++CONFIG_BCM43XX_DMA_AND_PIO_MODE=y ++# CONFIG_BCM43XX_DMA_MODE is not set ++# CONFIG_BCM43XX_PIO_MODE is not set +CONFIG_NET_WIRELESS=y + +# @@ -28426,9 +28532,12 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +CONFIG_PPP_SYNC_TTY=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_BSDCOMP=m -+# CONFIG_PPP_MPPE is not set ++CONFIG_PPP_MPPE=m +CONFIG_PPPOE=m -+# CONFIG_SLIP is not set ++CONFIG_SLIP=m ++CONFIG_SLIP_COMPRESSED=y ++CONFIG_SLIP_SMART=y ++# CONFIG_SLIP_MODE_SLIP6 is not set +# CONFIG_NET_FC is not set +# CONFIG_SHAPER is not set +# CONFIG_NETCONSOLE is not set @@ -28510,7 +28619,25 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# +# Watchdog Cards +# -+# CONFIG_WATCHDOG is not set ++CONFIG_WATCHDOG=y ++# CONFIG_WATCHDOG_NOWAYOUT is not set ++ ++# ++# Watchdog Device Drivers ++# ++# CONFIG_SOFT_WATCHDOG is not set ++CONFIG_SH_WDT=m ++ ++# ++# PCI-based Watchdog Cards ++# ++# CONFIG_PCIPCWATCHDOG is not set ++# CONFIG_WDTPCI is not set ++ ++# ++# USB-based Watchdog Cards ++# ++# CONFIG_USBPCWATCHDOG is not set +# CONFIG_RTC is not set +# CONFIG_GEN_RTC is not set +# CONFIG_DTLK is not set @@ -28535,6 +28662,12 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# CONFIG_I2C is not set + +# ++# SPI support ++# ++# CONFIG_SPI is not set ++# CONFIG_SPI_MASTER is not set ++ ++# +# Dallas's 1-wire bus +# +# CONFIG_W1 is not set @@ -28544,6 +28677,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# +CONFIG_HWMON=y +# CONFIG_HWMON_VID is not set ++# CONFIG_SENSORS_F71805F is not set +# CONFIG_HWMON_DEBUG_CHIP is not set + +# @@ -28551,18 +28685,16 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# + +# -+# Multimedia Capabilities Port drivers -+# -+ -+# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set ++CONFIG_VIDEO_V4L2=y + +# +# Digital Video Broadcasting Devices +# +# CONFIG_DVB is not set ++# CONFIG_USB_DABUSB is not set + +# +# Graphics support @@ -28584,7 +28716,8 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB_ARCH_HAS_OHCI=y -+CONFIG_USB=m ++CONFIG_USB_ARCH_HAS_EHCI=y ++CONFIG_USB=y +# CONFIG_USB_DEBUG is not set + +# @@ -28598,11 +28731,11 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# +# USB Host Controller Drivers +# -+CONFIG_USB_EHCI_HCD=m ++CONFIG_USB_EHCI_HCD=y +# CONFIG_USB_EHCI_SPLIT_ISO is not set +# CONFIG_USB_EHCI_ROOT_HUB_TT is not set +# CONFIG_USB_ISP116X_HCD is not set -+CONFIG_USB_OHCI_HCD=m ++CONFIG_USB_OHCI_HCD=y +# CONFIG_USB_OHCI_BIG_ENDIAN is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +# CONFIG_USB_UHCI_HCD is not set @@ -28611,8 +28744,8 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# +# USB Device Class drivers +# -+# CONFIG_USB_ACM is not set -+# CONFIG_USB_PRINTER is not set ++CONFIG_USB_ACM=m ++CONFIG_USB_PRINTER=m + +# +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' @@ -28621,7 +28754,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# +# may also be needed; see USB_STORAGE Help for more information +# -+CONFIG_USB_STORAGE=m ++CONFIG_USB_STORAGE=y +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set @@ -28630,6 +28763,8 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set ++# CONFIG_USB_STORAGE_ALAUDA is not set ++# CONFIG_USB_LIBUSUAL is not set + +# +# USB Input Devices @@ -28646,12 +28781,11 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# CONFIG_USB_ACECAD is not set +# CONFIG_USB_KBTAB is not set +# CONFIG_USB_POWERMATE is not set -+# CONFIG_USB_MTOUCH is not set -+# CONFIG_USB_ITMTOUCH is not set -+# CONFIG_USB_EGALAX is not set ++# CONFIG_USB_TOUCHSCREEN is not set +# CONFIG_USB_YEALINK is not set +# CONFIG_USB_XPAD is not set +# CONFIG_USB_ATI_REMOTE is not set ++# CONFIG_USB_ATI_REMOTE2 is not set +# CONFIG_USB_KEYSPAN_REMOTE is not set +# CONFIG_USB_APPLETOUCH is not set + @@ -28662,15 +28796,6 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# CONFIG_USB_MICROTEK is not set + +# -+# USB Multimedia devices -+# -+# CONFIG_USB_DABUSB is not set -+ -+# -+# Video4Linux support is needed for USB Multimedia device support -+# -+ -+# +# USB Network Adapters +# +# CONFIG_USB_CATC is not set @@ -28692,6 +28817,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +CONFIG_USB_SERIAL_GENERIC=y +# CONFIG_USB_SERIAL_AIRPRIME is not set +# CONFIG_USB_SERIAL_ANYDATA is not set ++CONFIG_USB_SERIAL_ARK3116=m +# CONFIG_USB_SERIAL_BELKIN is not set +# CONFIG_USB_SERIAL_WHITEHEAT is not set +# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set @@ -28699,6 +28825,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# CONFIG_USB_SERIAL_CYPRESS_M8 is not set +# CONFIG_USB_SERIAL_EMPEG is not set +# CONFIG_USB_SERIAL_FTDI_SIO is not set ++# CONFIG_USB_SERIAL_FUNSOFT is not set +# CONFIG_USB_SERIAL_VISOR is not set +# CONFIG_USB_SERIAL_IPAQ is not set +# CONFIG_USB_SERIAL_IR is not set @@ -28711,6 +28838,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# CONFIG_USB_SERIAL_KLSI is not set +# CONFIG_USB_SERIAL_KOBIL_SCT is not set +# CONFIG_USB_SERIAL_MCT_U232 is not set ++# CONFIG_USB_SERIAL_NAVMAN is not set +CONFIG_USB_SERIAL_PL2303=m +# CONFIG_USB_SERIAL_HP4X is not set +# CONFIG_USB_SERIAL_SAFE is not set @@ -28752,36 +28880,55 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# CONFIG_MMC is not set + +# ++# LED devices ++# ++# CONFIG_NEW_LEDS is not set ++ ++# ++# LED drivers ++# ++ ++# ++# LED Triggers ++# ++ ++# +# InfiniBand support +# +# CONFIG_INFINIBAND is not set + +# -+# SN Devices ++# EDAC - error detection and reporting (RAS) (EXPERIMENTAL) ++# ++ ++# ++# Real Time Clock +# ++# CONFIG_RTC_CLASS is not set + +# +# File systems +# +CONFIG_EXT2_FS=y -+CONFIG_EXT2_FS_XATTR=y -+CONFIG_EXT2_FS_POSIX_ACL=y -+CONFIG_EXT2_FS_SECURITY=y ++# CONFIG_EXT2_FS_XATTR is not set +# CONFIG_EXT2_FS_XIP is not set +CONFIG_EXT3_FS=y -+CONFIG_EXT3_FS_XATTR=y -+CONFIG_EXT3_FS_POSIX_ACL=y -+CONFIG_EXT3_FS_SECURITY=y ++# CONFIG_EXT3_FS_XATTR is not set +CONFIG_JBD=y +# CONFIG_JBD_DEBUG is not set -+CONFIG_FS_MBCACHE=y +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +# CONFIG_REISERFS_FS_XATTR is not set +# CONFIG_JFS_FS is not set -+CONFIG_FS_POSIX_ACL=y -+# CONFIG_XFS_FS is not set ++# CONFIG_FS_POSIX_ACL is not set ++CONFIG_XFS_FS=m ++CONFIG_XFS_EXPORT=y ++# CONFIG_XFS_QUOTA is not set ++# CONFIG_XFS_SECURITY is not set ++# CONFIG_XFS_POSIX_ACL is not set ++# CONFIG_XFS_RT is not set ++# CONFIG_OCFS2_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_INOTIFY=y @@ -28821,7 +28968,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# CONFIG_HUGETLBFS is not set +# CONFIG_HUGETLB_PAGE is not set +CONFIG_RAMFS=y -+CONFIG_RELAYFS_FS=m ++CONFIG_CONFIGFS_FS=m + +# +# Miscellaneous filesystems @@ -28833,6 +28980,8 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set ++# CONFIG_JFFS_FS is not set ++# CONFIG_JFFS2_FS is not set +# CONFIG_CRAMFS is not set +# CONFIG_VXFS_FS is not set +# CONFIG_HPFS_FS is not set @@ -28887,6 +29036,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set ++# CONFIG_KARMA_PARTITION is not set +# CONFIG_EFI_PARTITION is not set + +# @@ -28942,12 +29092,13 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# Kernel hacking +# +# CONFIG_PRINTK_TIME is not set -+CONFIG_DEBUG_KERNEL=y +CONFIG_MAGIC_SYSRQ=y ++CONFIG_DEBUG_KERNEL=y +CONFIG_LOG_BUF_SHIFT=16 +# CONFIG_DETECT_SOFTLOCKUP is not set +# CONFIG_SCHEDSTATS is not set -+CONFIG_DEBUG_SLAB=y ++# CONFIG_DEBUG_SLAB is not set ++# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set +# CONFIG_DEBUG_KOBJECT is not set @@ -28955,6 +29106,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# CONFIG_DEBUG_FS is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_FRAME_POINTER is not set ++# CONFIG_FORCED_INLINING is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_SH_STANDARD_BIOS is not set +CONFIG_EARLY_SCIF_CONSOLE=y @@ -28972,27 +29124,27 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +# +CONFIG_CRYPTO=y +CONFIG_CRYPTO_HMAC=y -+# CONFIG_CRYPTO_NULL is not set ++CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_MD4=m -+CONFIG_CRYPTO_MD5=m -+CONFIG_CRYPTO_SHA1=m ++CONFIG_CRYPTO_MD5=y ++CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_TGR192=m -+CONFIG_CRYPTO_DES=m ++CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_SERPENT=m -+CONFIG_CRYPTO_AES=m ++CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_TEA=m -+CONFIG_CRYPTO_ARC4=m ++CONFIG_CRYPTO_ARC4=y +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_ANUBIS=m -+CONFIG_CRYPTO_DEFLATE=m -+CONFIG_CRYPTO_MICHAEL_MIC=m ++CONFIG_CRYPTO_DEFLATE=y ++CONFIG_CRYPTO_MICHAEL_MIC=y +CONFIG_CRYPTO_CRC32C=m +# CONFIG_CRYPTO_TEST is not set + @@ -29007,15 +29159,15 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch +CONFIG_CRC16=m +CONFIG_CRC32=y +CONFIG_LIBCRC32C=m -+CONFIG_ZLIB_INFLATE=m -+CONFIG_ZLIB_DEFLATE=m ++CONFIG_ZLIB_INFLATE=y ++CONFIG_ZLIB_DEFLATE=y +CONFIG_TEXTSEARCH=y +CONFIG_TEXTSEARCH_KMP=m +CONFIG_TEXTSEARCH_BM=m +CONFIG_TEXTSEARCH_FSM=m diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/CVS/Entries linux-2.6.17/arch/sh/drivers/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/drivers/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/CVS/Entries 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,4 @@ +/Makefile/1.2/Thu Mar 17 07:43:07 2005// +D/dma//// @@ -29023,17 +29175,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/CVS/Entries linux-2.6.17/arch/sh/ +D/superhyway//// diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/CVS/Repository linux-2.6.17/arch/sh/drivers/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/drivers/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/CVS/Repository 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/drivers diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/CVS/Root linux-2.6.17/arch/sh/drivers/CVS/Root --- linux-2.6.17-vanilla/arch/sh/drivers/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/CVS/Root 2006-07-06 12:42:55.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/dma/CVS/Entries linux-2.6.17/arch/sh/drivers/dma/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/drivers/dma/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/dma/CVS/Entries 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/dma/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,10 @@ +/Kconfig/1.6/Sun Feb 5 15:23:46 2006// +/Makefile/1.5/Sun May 16 01:53:40 2004// @@ -29047,17 +29199,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/dma/CVS/Entries linux-2.6.17/arch +D diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/dma/CVS/Repository linux-2.6.17/arch/sh/drivers/dma/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/drivers/dma/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/dma/CVS/Repository 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/dma/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/drivers/dma diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/dma/CVS/Root linux-2.6.17/arch/sh/drivers/dma/CVS/Root --- linux-2.6.17-vanilla/arch/sh/drivers/dma/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/dma/CVS/Root 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/dma/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/dma/Kconfig linux-2.6.17/arch/sh/drivers/dma/Kconfig --- linux-2.6.17-vanilla/arch/sh/drivers/dma/Kconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/dma/Kconfig 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/dma/Kconfig 2006-07-07 10:17:07.000000000 +0000 @@ -11,6 +11,8 @@ config NR_ONCHIP_DMA_CHANNELS depends on SH_DMA @@ -29074,7 +29226,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/dma/Kconfig linux-2.6.17/arch/sh/ - diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/dma/dma-g2.c linux-2.6.17/arch/sh/drivers/dma/dma-g2.c --- linux-2.6.17-vanilla/arch/sh/drivers/dma/dma-g2.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/dma/dma-g2.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/dma/dma-g2.c 2006-07-07 10:17:07.000000000 +0000 @@ -3,7 +3,7 @@ * * G2 bus DMA support @@ -29180,7 +29332,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/dma/dma-g2.c linux-2.6.17/arch/sh - diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/dma/dma-pvr2.c linux-2.6.17/arch/sh/drivers/dma/dma-pvr2.c --- linux-2.6.17-vanilla/arch/sh/drivers/dma/dma-pvr2.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/dma/dma-pvr2.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/dma/dma-pvr2.c 2006-07-07 10:17:07.000000000 +0000 @@ -18,8 +18,8 @@ #include <asm/dma.h> #include <asm/io.h> @@ -29199,7 +29351,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/dma/dma-pvr2.c linux-2.6.17/arch/ - diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/dma/dma-sh.c linux-2.6.17/arch/sh/drivers/dma/dma-sh.c --- linux-2.6.17-vanilla/arch/sh/drivers/dma/dma-sh.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/dma/dma-sh.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/dma/dma-sh.c 2006-07-07 10:17:07.000000000 +0000 @@ -11,15 +11,11 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. @@ -29246,7 +29398,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/dma/dma-sh.c linux-2.6.17/arch/sh return register_dmac(info); diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/CVS/Entries linux-2.6.17/arch/sh/drivers/pci/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/drivers/pci/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/pci/CVS/Entries 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/pci/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,26 @@ +/Kconfig/1.4/Wed Mar 2 13:02:55 2005// +/Makefile/1.9/Wed Feb 8 21:55:09 2006// @@ -29276,17 +29428,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/CVS/Entries linux-2.6.17/arch +D diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/CVS/Repository linux-2.6.17/arch/sh/drivers/pci/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/drivers/pci/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/pci/CVS/Repository 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/pci/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/drivers/pci diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/CVS/Root linux-2.6.17/arch/sh/drivers/pci/CVS/Root --- linux-2.6.17-vanilla/arch/sh/drivers/pci/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/pci/CVS/Root 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/pci/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/Makefile linux-2.6.17/arch/sh/drivers/pci/Makefile --- linux-2.6.17-vanilla/arch/sh/drivers/pci/Makefile 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/pci/Makefile 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/pci/Makefile 2006-07-07 10:17:07.000000000 +0000 @@ -6,7 +6,8 @@ obj-$(CONFIG_PCI_AUTO) += pci-auto.o @@ -29306,7 +29458,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/Makefile linux-2.6.17/arch/sh +obj-$(CONFIG_SH_LANDISK) += ops-landisk.o diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/fixups-dreamcast.c linux-2.6.17/arch/sh/drivers/pci/fixups-dreamcast.c --- linux-2.6.17-vanilla/arch/sh/drivers/pci/fixups-dreamcast.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/pci/fixups-dreamcast.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/pci/fixups-dreamcast.c 2006-07-07 10:17:07.000000000 +0000 @@ -4,7 +4,7 @@ * PCI fixups for the Sega Dreamcast * @@ -29363,7 +29515,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/fixups-dreamcast.c linux-2.6. - diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/fixups-r7780rp.c linux-2.6.17/arch/sh/drivers/pci/fixups-r7780rp.c --- linux-2.6.17-vanilla/arch/sh/drivers/pci/fixups-r7780rp.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/pci/fixups-r7780rp.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/pci/fixups-r7780rp.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,45 @@ +/* + * arch/sh/drivers/pci/fixups-r7780rp.c @@ -29412,7 +29564,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/fixups-r7780rp.c linux-2.6.17 +} diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/fixups-rts7751r2d.c linux-2.6.17/arch/sh/drivers/pci/fixups-rts7751r2d.c --- linux-2.6.17-vanilla/arch/sh/drivers/pci/fixups-rts7751r2d.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/pci/fixups-rts7751r2d.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/pci/fixups-rts7751r2d.c 2006-07-07 10:17:07.000000000 +0000 @@ -10,8 +10,7 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. @@ -29459,7 +29611,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/fixups-rts7751r2d.c linux-2.6 } diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/fixups-sh03.c linux-2.6.17/arch/sh/drivers/pci/fixups-sh03.c --- linux-2.6.17-vanilla/arch/sh/drivers/pci/fixups-sh03.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/pci/fixups-sh03.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/pci/fixups-sh03.c 2006-07-07 10:17:07.000000000 +0000 @@ -3,11 +3,7 @@ #include <linux/types.h> #include <linux/pci.h> @@ -29518,7 +29670,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/fixups-sh03.c linux-2.6.17/ar -} diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/ops-bigsur.c linux-2.6.17/arch/sh/drivers/pci/ops-bigsur.c --- linux-2.6.17-vanilla/arch/sh/drivers/pci/ops-bigsur.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/pci/ops-bigsur.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/pci/ops-bigsur.c 2006-07-07 10:17:07.000000000 +0000 @@ -10,16 +10,13 @@ * * PCI initialization for the Hitachi Big Sur Evaluation Board @@ -29586,7 +29738,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/ops-bigsur.c linux-2.6.17/arc - diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/ops-landisk.c linux-2.6.17/arch/sh/drivers/pci/ops-landisk.c --- linux-2.6.17-vanilla/arch/sh/drivers/pci/ops-landisk.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/pci/ops-landisk.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/pci/ops-landisk.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,68 @@ +/* + * arch/sh/drivers/pci/ops-landisk.c @@ -29658,7 +29810,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/ops-landisk.c linux-2.6.17/ar +} diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/ops-r7780rp.c linux-2.6.17/arch/sh/drivers/pci/ops-r7780rp.c --- linux-2.6.17-vanilla/arch/sh/drivers/pci/ops-r7780rp.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/pci/ops-r7780rp.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/pci/ops-r7780rp.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,75 @@ +/* + * Author: Ian DaSilva (idasilva@mvista.com) @@ -29737,7 +29889,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/ops-r7780rp.c linux-2.6.17/ar +} diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/ops-rts7751r2d.c linux-2.6.17/arch/sh/drivers/pci/ops-rts7751r2d.c --- linux-2.6.17-vanilla/arch/sh/drivers/pci/ops-rts7751r2d.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/pci/ops-rts7751r2d.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/pci/ops-rts7751r2d.c 2006-07-07 10:17:07.000000000 +0000 @@ -18,12 +18,11 @@ #include <linux/delay.h> #include <linux/pci.h> @@ -29780,7 +29932,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/ops-rts7751r2d.c linux-2.6.17 int __init pcibios_init_platform(void) diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/ops-sh4.c linux-2.6.17/arch/sh/drivers/pci/ops-sh4.c --- linux-2.6.17-vanilla/arch/sh/drivers/pci/ops-sh4.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/pci/ops-sh4.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/pci/ops-sh4.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,164 @@ +/* + * Generic SH-4 / SH-4A PCIC operations (SH7751, SH7780). @@ -29948,7 +30100,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/ops-sh4.c linux-2.6.17/arch/s +} diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/ops-snapgear.c linux-2.6.17/arch/sh/drivers/pci/ops-snapgear.c --- linux-2.6.17-vanilla/arch/sh/drivers/pci/ops-snapgear.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/pci/ops-snapgear.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/pci/ops-snapgear.c 2006-07-07 10:17:07.000000000 +0000 @@ -2,7 +2,7 @@ * arch/sh/drivers/pci/ops-snapgear.c * @@ -30023,7 +30175,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/ops-snapgear.c linux-2.6.17/a - diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/ops-titan.c linux-2.6.17/arch/sh/drivers/pci/ops-titan.c --- linux-2.6.17-vanilla/arch/sh/drivers/pci/ops-titan.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/pci/ops-titan.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/pci/ops-titan.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,83 @@ +/* + * arch/sh/drivers/pci/ops-titan.c @@ -30110,7 +30262,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/ops-titan.c linux-2.6.17/arch +} diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/pci-auto.c linux-2.6.17/arch/sh/drivers/pci/pci-auto.c --- linux-2.6.17-vanilla/arch/sh/drivers/pci/pci-auto.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/pci/pci-auto.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/pci/pci-auto.c 2006-07-07 10:17:07.000000000 +0000 @@ -45,11 +45,11 @@ #include <linux/types.h> #include <linux/pci.h> @@ -30284,7 +30436,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/pci-auto.c linux-2.6.17/arch/ pciauto_lower_iospc, pciauto_lower_memspc); diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/pci-sh4.h linux-2.6.17/arch/sh/drivers/pci/pci-sh4.h --- linux-2.6.17-vanilla/arch/sh/drivers/pci/pci-sh4.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/pci/pci-sh4.h 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/pci/pci-sh4.h 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,180 @@ +#ifndef __PCI_SH4_H +#define __PCI_SH4_H @@ -30468,7 +30620,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/pci-sh4.h linux-2.6.17/arch/s +#endif /* __PCI_SH4_H */ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/pci-sh7751.c linux-2.6.17/arch/sh/drivers/pci/pci-sh7751.c --- linux-2.6.17-vanilla/arch/sh/drivers/pci/pci-sh7751.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/pci/pci-sh7751.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/pci/pci-sh7751.c 2006-07-07 10:17:07.000000000 +0000 @@ -16,206 +16,44 @@ #undef DEBUG @@ -30930,7 +31082,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/pci-sh7751.c linux-2.6.17/arc - diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/pci-sh7751.h linux-2.6.17/arch/sh/drivers/pci/pci-sh7751.h --- linux-2.6.17-vanilla/arch/sh/drivers/pci/pci-sh7751.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/pci/pci-sh7751.h 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/pci/pci-sh7751.h 2006-07-07 10:17:07.000000000 +0000 @@ -3,7 +3,7 @@ * * Dustin McIntire (dustin@sensoria.com) (c) 2001 @@ -31136,7 +31288,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/pci-sh7751.h linux-2.6.17/arc - diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/pci-sh7780.c linux-2.6.17/arch/sh/drivers/pci/pci-sh7780.c --- linux-2.6.17-vanilla/arch/sh/drivers/pci/pci-sh7780.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/pci/pci-sh7780.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/pci/pci-sh7780.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,139 @@ +/* + * Low-Level PCI Support for the SH7780 @@ -31279,7 +31431,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/pci-sh7780.c linux-2.6.17/arc +} diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/pci-sh7780.h linux-2.6.17/arch/sh/drivers/pci/pci-sh7780.h --- linux-2.6.17-vanilla/arch/sh/drivers/pci/pci-sh7780.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/pci/pci-sh7780.h 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/pci/pci-sh7780.h 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,94 @@ +/* + * Low-Level PCI Support for SH7780 targets @@ -31377,7 +31529,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/pci-sh7780.h linux-2.6.17/arc +#endif /* _PCI_SH7780_H_ */ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/pci-st40.c linux-2.6.17/arch/sh/drivers/pci/pci-st40.c --- linux-2.6.17-vanilla/arch/sh/drivers/pci/pci-st40.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/pci/pci-st40.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/pci/pci-st40.c 2006-07-07 10:17:07.000000000 +0000 @@ -71,12 +71,6 @@ static void pci_set_rbar_region(unsigned int region, unsigned long localAddr, unsigned long pciOffset, unsigned long regionSize); @@ -31499,7 +31651,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/pci-st40.c linux-2.6.17/arch/ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/pci.c linux-2.6.17/arch/sh/drivers/pci/pci.c --- linux-2.6.17-vanilla/arch/sh/drivers/pci/pci.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/pci/pci.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/pci/pci.c 2006-07-07 10:17:07.000000000 +0000 @@ -1,21 +1,45 @@ -/* arch/sh/kernel/pci.c - * $Id: pci.c,v 1.1 2003/08/24 19:15:45 lethal Exp $ @@ -31665,29 +31817,29 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/pci/pci.c linux-2.6.17/arch/sh/dr +EXPORT_SYMBOL(pci_iounmap); diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/superhyway/CVS/Entries linux-2.6.17/arch/sh/drivers/superhyway/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/drivers/superhyway/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/superhyway/CVS/Entries 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/superhyway/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,3 @@ +/Makefile/1.1/Thu Mar 17 07:43:07 2005// +/ops-sh4-202.c/1.3/Tue Jan 3 22:35:52 2006// +D diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/superhyway/CVS/Repository linux-2.6.17/arch/sh/drivers/superhyway/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/drivers/superhyway/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/superhyway/CVS/Repository 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/superhyway/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/drivers/superhyway diff -ruN linux-2.6.17-vanilla/arch/sh/drivers/superhyway/CVS/Root linux-2.6.17/arch/sh/drivers/superhyway/CVS/Root --- linux-2.6.17-vanilla/arch/sh/drivers/superhyway/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/drivers/superhyway/CVS/Root 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/drivers/superhyway/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/.cvsignore linux-2.6.17/arch/sh/kernel/.cvsignore --- linux-2.6.17-vanilla/arch/sh/kernel/.cvsignore 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/.cvsignore 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/.cvsignore 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +vmlinux.lds.s diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/CVS/Entries linux-2.6.17/arch/sh/kernel/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/kernel/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/CVS/Entries 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,34 @@ +/.cvsignore/1.1/Wed May 12 13:51:13 2004/-ko/ +/Makefile/1.19/Sun Jan 29 17:46:23 2006// @@ -31713,29 +31865,29 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/CVS/Entries linux-2.6.17/arch/sh/k +/signal.c/1.30/Fri Oct 28 13:12:48 2005/-ko/ +/smp.c/1.10/Mon Mar 27 21:06:14 2006/-ko/ +/sys_sh.c/1.11/Sat Dec 31 11:30:47 2005// -+/syscalls.S/1.3/Mon Sep 19 19:20:56 2005/-ko/ +/time.c/1.37/Sun Jan 29 17:46:23 2006/-ko/ +/traps.c/1.20/Thu Mar 17 07:40:19 2005/-ko/ +/vmlinux.lds.S/1.6/Thu Mar 17 07:49:06 2005/-ko/ +D/cpu//// +D/timers//// +/irq.c/1.28/Wed Jul 5 14:50:39 2006/-ko/ -+/process.c/1.41/Wed Jul 5 14:50:39 2006/-ko/ +/setup.c/1.52/Wed Jul 5 14:50:40 2006/-ko/ +/sh_ksyms.c/1.25/Wed Jul 5 14:50:40 2006// ++/process.c/1.42/Fri Jul 7 10:15:14 2006/-ko/ ++/syscalls.S/1.4/Fri Jul 7 10:15:14 2006/-ko/ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/CVS/Repository linux-2.6.17/arch/sh/kernel/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/kernel/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/CVS/Repository 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/kernel diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/CVS/Root linux-2.6.17/arch/sh/kernel/CVS/Root --- linux-2.6.17-vanilla/arch/sh/kernel/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/CVS/Root 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/Makefile linux-2.6.17/arch/sh/kernel/Makefile --- linux-2.6.17-vanilla/arch/sh/kernel/Makefile 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/Makefile 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/Makefile 2006-07-07 10:17:07.000000000 +0000 @@ -6,7 +6,7 @@ obj-y := process.o signal.o entry.o traps.o irq.o \ @@ -31753,7 +31905,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/Makefile linux-2.6.17/arch/sh/kern +obj-$(CONFIG_PM) += pm.o diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/apm.c linux-2.6.17/arch/sh/kernel/apm.c --- linux-2.6.17-vanilla/arch/sh/kernel/apm.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/apm.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/apm.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,539 @@ +/* + * bios-less APM driver for hp680 @@ -32296,7 +32448,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/apm.c linux-2.6.17/arch/sh/kernel/ +MODULE_LICENSE("GPL"); diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cf-enabler.c linux-2.6.17/arch/sh/kernel/cf-enabler.c --- linux-2.6.17-vanilla/arch/sh/kernel/cf-enabler.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/cf-enabler.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/cf-enabler.c 2006-07-07 10:17:07.000000000 +0000 @@ -11,7 +11,8 @@ #include <linux/config.h> @@ -32346,7 +32498,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cf-enabler.c linux-2.6.17/arch/sh/ * SolutionEngine diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/CVS/Entries linux-2.6.17/arch/sh/kernel/cpu/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/kernel/cpu/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/cpu/CVS/Entries 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/cpu/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,10 @@ +/Makefile/1.10/Sat Jan 28 01:22:16 2006/-ko/ +/adc.c/1.2/Sun Aug 15 16:59:26 2004/-ko/ @@ -32360,17 +32512,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/CVS/Entries linux-2.6.17/arch/ +/rtc.c/1.5/Wed Jul 5 14:50:40 2006/-ko/ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/CVS/Repository linux-2.6.17/arch/sh/kernel/cpu/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/kernel/cpu/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/cpu/CVS/Repository 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/cpu/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/kernel/cpu diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/CVS/Root linux-2.6.17/arch/sh/kernel/cpu/CVS/Root --- linux-2.6.17-vanilla/arch/sh/kernel/cpu/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/cpu/CVS/Root 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/cpu/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/clock.c linux-2.6.17/arch/sh/kernel/cpu/clock.c --- linux-2.6.17-vanilla/arch/sh/kernel/cpu/clock.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/cpu/clock.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/cpu/clock.c 2006-07-07 10:17:07.000000000 +0000 @@ -225,7 +225,7 @@ { int i, ret = 0; @@ -32382,7 +32534,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/clock.c linux-2.6.17/arch/sh/k struct clk *clk = onchip_clocks[i]; diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/init.c linux-2.6.17/arch/sh/kernel/cpu/init.c --- linux-2.6.17-vanilla/arch/sh/kernel/cpu/init.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/cpu/init.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/cpu/init.c 2006-07-07 10:17:07.000000000 +0000 @@ -4,6 +4,7 @@ * CPU init code * @@ -32429,7 +32581,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/init.c linux-2.6.17/arch/sh/ke ctrl_outl(flags, CCR); diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/irq/CVS/Entries linux-2.6.17/arch/sh/kernel/cpu/irq/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/kernel/cpu/irq/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/cpu/irq/CVS/Entries 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/cpu/irq/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,6 @@ +/Makefile/1.1/Sat Jan 7 20:16:39 2006/-ko/ +/imask.c/1.1/Sat Jan 7 20:16:39 2006/-ko/ @@ -32439,34 +32591,34 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/irq/CVS/Entries linux-2.6.17/a +D diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/irq/CVS/Repository linux-2.6.17/arch/sh/kernel/cpu/irq/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/kernel/cpu/irq/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/cpu/irq/CVS/Repository 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/cpu/irq/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/kernel/cpu/irq diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/irq/CVS/Root linux-2.6.17/arch/sh/kernel/cpu/irq/CVS/Root --- linux-2.6.17-vanilla/arch/sh/kernel/cpu/irq/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/cpu/irq/CVS/Root 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/cpu/irq/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh2/CVS/Entries linux-2.6.17/arch/sh/kernel/cpu/sh2/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh2/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/cpu/sh2/CVS/Entries 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/cpu/sh2/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,3 @@ +/Makefile/1.3/Thu Jul 8 13:52:22 2004/-ko/ +/probe.c/1.1/Thu Jul 8 13:52:22 2004/-ko/ +D diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh2/CVS/Repository linux-2.6.17/arch/sh/kernel/cpu/sh2/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh2/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/cpu/sh2/CVS/Repository 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/cpu/sh2/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/kernel/cpu/sh2 diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh2/CVS/Root linux-2.6.17/arch/sh/kernel/cpu/sh2/CVS/Root --- linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh2/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/cpu/sh2/CVS/Root 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/cpu/sh2/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh3/CVS/Entries linux-2.6.17/arch/sh/kernel/cpu/sh3/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh3/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/cpu/sh3/CVS/Entries 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/cpu/sh3/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,8 @@ +/Makefile/1.6/Fri Jun 10 15:51:47 2005/-ko/ +/clock-sh3.c/1.1/Sat Mar 26 20:25:36 2005/-ko/ @@ -32478,17 +32630,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh3/CVS/Entries linux-2.6.17/a +D diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh3/CVS/Repository linux-2.6.17/arch/sh/kernel/cpu/sh3/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh3/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/cpu/sh3/CVS/Repository 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/cpu/sh3/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/kernel/cpu/sh3 diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh3/CVS/Root linux-2.6.17/arch/sh/kernel/cpu/sh3/CVS/Root --- linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh3/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/cpu/sh3/CVS/Root 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/cpu/sh3/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh3/clock-sh7709.c linux-2.6.17/arch/sh/kernel/cpu/sh3/clock-sh7709.c --- linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh3/clock-sh7709.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/cpu/sh3/clock-sh7709.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/cpu/sh3/clock-sh7709.c 2006-07-07 10:17:07.000000000 +0000 @@ -4,7 +4,7 @@ * SH7709 support for the clock framework * @@ -32509,7 +32661,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh3/clock-sh7709.c linux-2.6.1 clk->rate = clk->parent->rate * stc_multipliers[idx]; diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh4/CVS/Entries linux-2.6.17/arch/sh/kernel/cpu/sh4/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh4/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/cpu/sh4/CVS/Entries 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/cpu/sh4/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,11 @@ +/Makefile/1.12/Sat Jan 7 20:16:39 2006/-ko/ +/clock-sh4-202.c/1.1/Sat Mar 26 20:25:36 2005/-ko/ @@ -32524,17 +32676,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh4/CVS/Entries linux-2.6.17/a +D diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh4/CVS/Repository linux-2.6.17/arch/sh/kernel/cpu/sh4/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh4/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/cpu/sh4/CVS/Repository 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/cpu/sh4/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/kernel/cpu/sh4 diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh4/CVS/Root linux-2.6.17/arch/sh/kernel/cpu/sh4/CVS/Root --- linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh4/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/cpu/sh4/CVS/Root 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/cpu/sh4/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh4/Makefile linux-2.6.17/arch/sh/kernel/cpu/sh4/Makefile --- linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh4/Makefile 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/cpu/sh4/Makefile 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/cpu/sh4/Makefile 2006-07-07 10:17:07.000000000 +0000 @@ -4,7 +4,7 @@ obj-y := ex.o probe.o @@ -32546,7 +32698,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh4/Makefile linux-2.6.17/arch # Primary on-chip clocks (common) diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh4/ex.S linux-2.6.17/arch/sh/kernel/cpu/sh4/ex.S --- linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh4/ex.S 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/cpu/sh4/ex.S 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/cpu/sh4/ex.S 2006-07-07 10:17:07.000000000 +0000 @@ -39,9 +39,9 @@ #endif #if defined(CONFIG_SH_FPU) @@ -32755,7 +32907,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh4/ex.S linux-2.6.17/arch/sh/ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh4/probe.c linux-2.6.17/arch/sh/kernel/cpu/sh4/probe.c --- linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh4/probe.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/cpu/sh4/probe.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/cpu/sh4/probe.c 2006-07-07 10:17:07.000000000 +0000 @@ -3,7 +3,7 @@ * * CPU Subtype Probing for SH-4. @@ -32906,7 +33058,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh4/probe.c linux-2.6.17/arch/ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.17/arch/sh/kernel/cpu/sh4/sq.c --- linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh4/sq.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/cpu/sh4/sq.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/cpu/sh4/sq.c 2006-07-07 10:17:07.000000000 +0000 @@ -1,50 +1,53 @@ /* - * arch/sh/kernel/cpu/sq.c @@ -33602,7 +33754,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh4/sq.c linux-2.6.17/arch/sh/ - diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/early_printk.c linux-2.6.17/arch/sh/kernel/early_printk.c --- linux-2.6.17-vanilla/arch/sh/kernel/early_printk.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/early_printk.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/early_printk.c 2006-07-07 10:17:07.000000000 +0000 @@ -59,34 +59,42 @@ #endif @@ -33671,7 +33823,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/early_printk.c linux-2.6.17/arch/s register_console(&early_console); diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/entry.S linux-2.6.17/arch/sh/kernel/entry.S --- linux-2.6.17-vanilla/arch/sh/kernel/entry.S 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/entry.S 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/entry.S 2006-07-07 10:17:07.000000000 +0000 @@ -19,24 +19,6 @@ #include <asm/cpu/mmu_context.h> #include <asm/unistd.h> @@ -34027,7 +34179,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/entry.S linux-2.6.17/arch/sh/kerne -/* End of entry.S */ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/head.S linux-2.6.17/arch/sh/kernel/head.S --- linux-2.6.17-vanilla/arch/sh/kernel/head.S 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/head.S 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/head.S 2006-07-07 10:17:07.000000000 +0000 @@ -12,6 +12,17 @@ */ #include <linux/linkage.h> @@ -34103,7 +34255,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/head.S linux-2.6.17/arch/sh/kernel 5: .long start_kernel diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/kgdb_stub.c linux-2.6.17/arch/sh/kernel/kgdb_stub.c --- linux-2.6.17-vanilla/arch/sh/kernel/kgdb_stub.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/kgdb_stub.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/kgdb_stub.c 2006-07-07 10:17:07.000000000 +0000 @@ -101,16 +101,17 @@ #include <linux/linkage.h> #include <linux/init.h> @@ -34166,7 +34318,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/kgdb_stub.c linux-2.6.17/arch/sh/k static int hex(const char ch) diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/machine_kexec.c linux-2.6.17/arch/sh/kernel/machine_kexec.c --- linux-2.6.17-vanilla/arch/sh/kernel/machine_kexec.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/machine_kexec.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/machine_kexec.c 2006-07-07 10:17:07.000000000 +0000 @@ -27,7 +27,7 @@ const extern unsigned char relocate_new_kernel[]; @@ -34196,7 +34348,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/machine_kexec.c linux-2.6.17/arch/ local_irq_disable(); diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/pm.c linux-2.6.17/arch/sh/kernel/pm.c --- linux-2.6.17-vanilla/arch/sh/kernel/pm.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/pm.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/pm.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,88 @@ +/* + * Generic Power Management Routine @@ -34288,7 +34440,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/pm.c linux-2.6.17/arch/sh/kernel/p +} diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/process.c linux-2.6.17/arch/sh/kernel/process.c --- linux-2.6.17-vanilla/arch/sh/kernel/process.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/process.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/process.c 2006-07-07 10:17:07.000000000 +0000 @@ -227,13 +227,13 @@ return fpvalid; } @@ -34305,7 +34457,26 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/process.c linux-2.6.17/arch/sh/ker ptregs = *task_pt_regs(tsk); elf_core_copy_regs(regs, &ptregs); -@@ -345,7 +345,7 @@ +@@ -262,6 +262,7 @@ + unsigned long unused, + struct task_struct *p, struct pt_regs *regs) + { ++ struct thread_info *ti = task_thread_info(p); + struct pt_regs *childregs; + #if defined(CONFIG_SH_FPU) + struct task_struct *tsk = current; +@@ -276,8 +277,10 @@ + + if (user_mode(regs)) { + childregs->regs[15] = usp; ++ ti->addr_limit = USER_DS; + } else { + childregs->regs[15] = (unsigned long)task_stack_page(p) + THREAD_SIZE; ++ ti->addr_limit = KERNEL_DS; + } + if (clone_flags & CLONE_SETTLS) { + childregs->gbr = childregs->regs[0]; +@@ -345,7 +348,7 @@ /* * Restore the kernel mode register @@ -34316,7 +34487,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/process.c linux-2.6.17/arch/sh/ker : /* no output */ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/ptrace.c linux-2.6.17/arch/sh/kernel/ptrace.c --- linux-2.6.17-vanilla/arch/sh/kernel/ptrace.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/ptrace.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/ptrace.c 2006-07-07 10:17:07.000000000 +0000 @@ -225,7 +225,6 @@ case PTRACE_SETDSPREGS: { @@ -34327,7 +34498,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/ptrace.c linux-2.6.17/arch/sh/kern dp = ((unsigned long) child) + THREAD_SIZE - diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/relocate_kernel.S linux-2.6.17/arch/sh/kernel/relocate_kernel.S --- linux-2.6.17-vanilla/arch/sh/kernel/relocate_kernel.S 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/relocate_kernel.S 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/relocate_kernel.S 2006-07-07 10:17:07.000000000 +0000 @@ -12,8 +12,8 @@ #include <linux/linkage.h> @@ -34410,7 +34581,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/relocate_kernel.S linux-2.6.17/arc 6: diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/semaphore.c linux-2.6.17/arch/sh/kernel/semaphore.c --- linux-2.6.17-vanilla/arch/sh/kernel/semaphore.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/semaphore.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/semaphore.c 2006-07-07 10:17:07.000000000 +0000 @@ -14,7 +14,7 @@ #include <asm/semaphore.h> #include <asm/semaphore-helper.h> @@ -34422,7 +34593,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/semaphore.c linux-2.6.17/arch/sh/k * Semaphores are implemented using a two-way counter: diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/sh_ksyms.c linux-2.6.17/arch/sh/kernel/sh_ksyms.c --- linux-2.6.17-vanilla/arch/sh/kernel/sh_ksyms.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/sh_ksyms.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/sh_ksyms.c 2006-07-07 10:17:07.000000000 +0000 @@ -28,7 +28,6 @@ /* platform dependent support */ @@ -34455,7 +34626,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/sh_ksyms.c linux-2.6.17/arch/sh/ke EXPORT_SYMBOL(clear_page); diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/sys_sh.c linux-2.6.17/arch/sh/kernel/sys_sh.c --- linux-2.6.17-vanilla/arch/sh/kernel/sys_sh.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/sys_sh.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/sys_sh.c 2006-07-07 10:17:07.000000000 +0000 @@ -21,7 +21,7 @@ #include <linux/mman.h> #include <linux/file.h> @@ -34467,8 +34638,8 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/sys_sh.c linux-2.6.17/arch/sh/kern diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/syscalls.S linux-2.6.17/arch/sh/kernel/syscalls.S --- linux-2.6.17-vanilla/arch/sh/kernel/syscalls.S 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/syscalls.S 2006-07-06 12:42:56.000000000 +0000 -@@ -0,0 +1,332 @@ ++++ linux-2.6.17/arch/sh/kernel/syscalls.S 2006-07-07 10:17:07.000000000 +0000 +@@ -0,0 +1,354 @@ +/* + * arch/sh/kernel/syscalls.S + * @@ -34800,10 +34971,32 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/syscalls.S linux-2.6.17/arch/sh/ke + .long sys_inotify_init /* 290 */ + .long sys_inotify_add_watch + .long sys_inotify_rm_watch -+ ++ .long sys_migrate_pages ++ .long sys_openat ++ .long sys_mkdirat /* 295 */ ++ .long sys_mknodat ++ .long sys_fchownat ++ .long sys_futimesat ++ .long sys_fstatat64 ++ .long sys_unlinkat /* 300 */ ++ .long sys_renameat ++ .long sys_linkat ++ .long sys_symlinkat ++ .long sys_readlinkat ++ .long sys_fchmodat /* 305 */ ++ .long sys_faccessat ++ .long sys_ni_syscall /* Reserved for pselect6 */ ++ .long sys_ni_syscall /* Reserved for ppoll */ ++ .long sys_unshare ++ .long sys_set_robust_list /* 310 */ ++ .long sys_get_robust_list ++ .long sys_splice ++ .long sys_sync_file_range ++ .long sys_tee ++ .long sys_vmsplice /* 315 */ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/time.c linux-2.6.17/arch/sh/kernel/time.c --- linux-2.6.17-vanilla/arch/sh/kernel/time.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/time.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/time.c 2006-07-07 10:17:07.000000000 +0000 @@ -144,8 +144,33 @@ } } @@ -34840,7 +35033,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/time.c linux-2.6.17/arch/sh/kernel static int __init timer_init_sysfs(void) diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/timers/CVS/Entries linux-2.6.17/arch/sh/kernel/timers/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/kernel/timers/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/timers/CVS/Entries 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/timers/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,4 @@ +/Makefile/1.1/Sat Mar 26 20:25:36 2005/-ko/ +/timer-tmu.c/1.3/Sun Jan 29 17:46:24 2006/-ko/ @@ -34848,17 +35041,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/timers/CVS/Entries linux-2.6.17/ar +D diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/timers/CVS/Repository linux-2.6.17/arch/sh/kernel/timers/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/kernel/timers/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/timers/CVS/Repository 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/timers/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/kernel/timers diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/timers/CVS/Root linux-2.6.17/arch/sh/kernel/timers/CVS/Root --- linux-2.6.17-vanilla/arch/sh/kernel/timers/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/timers/CVS/Root 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/timers/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/timers/timer-tmu.c linux-2.6.17/arch/sh/kernel/timers/timer-tmu.c --- linux-2.6.17-vanilla/arch/sh/kernel/timers/timer-tmu.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/timers/timer-tmu.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/timers/timer-tmu.c 2006-07-07 10:17:07.000000000 +0000 @@ -188,6 +188,18 @@ .ops = &tmu_clk_ops, }; @@ -34906,7 +35099,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/timers/timer-tmu.c linux-2.6.17/ar }; diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/traps.c linux-2.6.17/arch/sh/kernel/traps.c --- linux-2.6.17-vanilla/arch/sh/kernel/traps.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/traps.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/traps.c 2006-07-07 10:17:07.000000000 +0000 @@ -87,7 +87,7 @@ #define VMALLOC_OFFSET (8*1024*1024) #define MODULE_RANGE (8*1024*1024) @@ -34918,7 +35111,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/traps.c linux-2.6.17/arch/sh/kerne { diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/vmlinux.lds.S linux-2.6.17/arch/sh/kernel/vmlinux.lds.S --- linux-2.6.17-vanilla/arch/sh/kernel/vmlinux.lds.S 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/kernel/vmlinux.lds.S 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/kernel/vmlinux.lds.S 2006-07-07 10:17:07.000000000 +0000 @@ -63,8 +63,6 @@ . = ALIGN(8192); /* init_task */ @@ -34930,7 +35123,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/vmlinux.lds.S linux-2.6.17/arch/sh __init_begin = .; diff -ruN linux-2.6.17-vanilla/arch/sh/lib/CVS/Entries linux-2.6.17/arch/sh/lib/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/lib/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/lib/CVS/Entries 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/lib/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,13 @@ +/Makefile/1.9/Tue Jun 29 01:59:02 2004/-ko/ +/checksum.S/1.3/Fri Sep 2 23:02:18 2005/-ko/ @@ -34947,17 +35140,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/lib/CVS/Entries linux-2.6.17/arch/sh/lib/ +D diff -ruN linux-2.6.17-vanilla/arch/sh/lib/CVS/Repository linux-2.6.17/arch/sh/lib/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/lib/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/lib/CVS/Repository 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/lib/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/lib diff -ruN linux-2.6.17-vanilla/arch/sh/lib/CVS/Root linux-2.6.17/arch/sh/lib/CVS/Root --- linux-2.6.17-vanilla/arch/sh/lib/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/lib/CVS/Root 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/lib/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/lib/checksum.S linux-2.6.17/arch/sh/lib/checksum.S --- linux-2.6.17-vanilla/arch/sh/lib/checksum.S 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/lib/checksum.S 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/lib/checksum.S 2006-07-07 10:17:07.000000000 +0000 @@ -202,8 +202,9 @@ cmp/pz r6 ! Jump if we had at least two bytes. bt/s 1f @@ -34971,7 +35164,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/lib/checksum.S linux-2.6.17/arch/sh/lib/c ! This is not common, so simple byte by byte copy will do. diff -ruN linux-2.6.17-vanilla/arch/sh/lib/memcpy-sh4.S linux-2.6.17/arch/sh/lib/memcpy-sh4.S --- linux-2.6.17-vanilla/arch/sh/lib/memcpy-sh4.S 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/lib/memcpy-sh4.S 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/lib/memcpy-sh4.S 2006-07-07 10:17:07.000000000 +0000 @@ -20,7 +20,7 @@ ! ! GHIJ KLMN OPQR --> ...G HIJK LMNO PQR. @@ -35378,7 +35571,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/lib/memcpy-sh4.S linux-2.6.17/arch/sh/lib cmp/eq r4,r0 ! 54 MT diff -ruN linux-2.6.17-vanilla/arch/sh/lib/memmove.S linux-2.6.17/arch/sh/lib/memmove.S --- linux-2.6.17-vanilla/arch/sh/lib/memmove.S 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/lib/memmove.S 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/lib/memmove.S 2006-07-07 10:17:07.000000000 +0000 @@ -1,4 +1,4 @@ -/* $Id: memmove.S,v 1.2 2001/07/27 11:51:09 gniibe Exp $ +/* $Id: memmove.S,v 1.3 2003/05/04 19:29:54 lethal Exp $ @@ -35387,7 +35580,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/lib/memmove.S linux-2.6.17/arch/sh/lib/me * diff -ruN linux-2.6.17-vanilla/arch/sh/lib/memset.S linux-2.6.17/arch/sh/lib/memset.S --- linux-2.6.17-vanilla/arch/sh/lib/memset.S 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/lib/memset.S 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/lib/memset.S 2006-07-07 10:17:07.000000000 +0000 @@ -29,6 +29,7 @@ bf/s 1b mov.b r5,@-r4 @@ -35398,7 +35591,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/lib/memset.S linux-2.6.17/arch/sh/lib/mem swap.w r5,r0 ! VV00 diff -ruN linux-2.6.17-vanilla/arch/sh/mm/CVS/Entries linux-2.6.17/arch/sh/mm/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/mm/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/mm/CVS/Entries 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/mm/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,25 @@ +/Kconfig/1.10/Sun Jan 8 12:22:58 2006/-ko/ +/Makefile/1.14/Wed Jan 4 14:49:04 2006// @@ -35427,17 +35620,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/mm/CVS/Entries linux-2.6.17/arch/sh/mm/CV +D diff -ruN linux-2.6.17-vanilla/arch/sh/mm/CVS/Repository linux-2.6.17/arch/sh/mm/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/mm/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/mm/CVS/Repository 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/mm/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/mm diff -ruN linux-2.6.17-vanilla/arch/sh/mm/CVS/Root linux-2.6.17/arch/sh/mm/CVS/Root --- linux-2.6.17-vanilla/arch/sh/mm/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/mm/CVS/Root 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/mm/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/mm/Kconfig linux-2.6.17/arch/sh/mm/Kconfig --- linux-2.6.17-vanilla/arch/sh/mm/Kconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/mm/Kconfig 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/mm/Kconfig 2006-07-07 10:17:07.000000000 +0000 @@ -20,7 +20,6 @@ config CPU_SH4A bool @@ -35456,7 +35649,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/mm/Kconfig linux-2.6.17/arch/sh/mm/Kconfi diff -ruN linux-2.6.17-vanilla/arch/sh/mm/Makefile linux-2.6.17/arch/sh/mm/Makefile --- linux-2.6.17-vanilla/arch/sh/mm/Makefile 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/mm/Makefile 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/mm/Makefile 2006-07-07 10:17:07.000000000 +0000 @@ -12,14 +12,16 @@ obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o @@ -35480,7 +35673,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/mm/Makefile linux-2.6.17/arch/sh/mm/Makef +obj-$(CONFIG_32BIT) += pmb.o diff -ruN linux-2.6.17-vanilla/arch/sh/mm/cache-sh4.c linux-2.6.17/arch/sh/mm/cache-sh4.c --- linux-2.6.17-vanilla/arch/sh/mm/cache-sh4.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/mm/cache-sh4.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/mm/cache-sh4.c 2006-07-07 10:17:07.000000000 +0000 @@ -2,7 +2,7 @@ * arch/sh/mm/cache-sh4.c * @@ -36216,7 +36409,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/mm/cache-sh4.c linux-2.6.17/arch/sh/mm/ca diff -ruN linux-2.6.17-vanilla/arch/sh/mm/clear_page.S linux-2.6.17/arch/sh/mm/clear_page.S --- linux-2.6.17-vanilla/arch/sh/mm/clear_page.S 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/mm/clear_page.S 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/mm/clear_page.S 2006-07-07 10:17:07.000000000 +0000 @@ -194,102 +194,5 @@ nop .L4096: .word 4096 @@ -36323,7 +36516,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/mm/clear_page.S linux-2.6.17/arch/sh/mm/c + diff -ruN linux-2.6.17-vanilla/arch/sh/mm/consistent.c linux-2.6.17/arch/sh/mm/consistent.c --- linux-2.6.17-vanilla/arch/sh/mm/consistent.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/mm/consistent.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/mm/consistent.c 2006-07-07 10:17:07.000000000 +0000 @@ -9,6 +9,8 @@ */ #include <linux/mm.h> @@ -36335,7 +36528,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/mm/consistent.c linux-2.6.17/arch/sh/mm/c void *consistent_alloc(gfp_t gfp, size_t size, dma_addr_t *handle) diff -ruN linux-2.6.17-vanilla/arch/sh/mm/fault.c linux-2.6.17/arch/sh/mm/fault.c --- linux-2.6.17-vanilla/arch/sh/mm/fault.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/mm/fault.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/mm/fault.c 2006-07-07 10:17:07.000000000 +0000 @@ -1,33 +1,21 @@ -/* $Id: fault.c,v 1.14 2004/01/13 05:52:11 kkojima Exp $ +/* @@ -36596,7 +36789,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/mm/fault.c linux-2.6.17/arch/sh/mm/fault. -} diff -ruN linux-2.6.17-vanilla/arch/sh/mm/hugetlbpage.c linux-2.6.17/arch/sh/mm/hugetlbpage.c --- linux-2.6.17-vanilla/arch/sh/mm/hugetlbpage.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/mm/hugetlbpage.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/mm/hugetlbpage.c 2006-07-07 10:17:07.000000000 +0000 @@ -27,61 +27,41 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr) { @@ -36677,7 +36870,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/mm/hugetlbpage.c linux-2.6.17/arch/sh/mm/ struct page *follow_huge_addr(struct mm_struct *mm, diff -ruN linux-2.6.17-vanilla/arch/sh/mm/init.c linux-2.6.17/arch/sh/mm/init.c --- linux-2.6.17-vanilla/arch/sh/mm/init.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/mm/init.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/mm/init.c 2006-07-07 10:17:07.000000000 +0000 @@ -61,7 +61,7 @@ printk("Mem-info:\n"); @@ -36716,7 +36909,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/mm/init.c linux-2.6.17/arch/sh/mm/init.c set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE | _PAGE_USER)); diff -ruN linux-2.6.17-vanilla/arch/sh/mm/ioremap.c linux-2.6.17/arch/sh/mm/ioremap.c --- linux-2.6.17-vanilla/arch/sh/mm/ioremap.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/mm/ioremap.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/mm/ioremap.c 2006-07-07 10:17:07.000000000 +0000 @@ -15,6 +15,7 @@ #include <linux/vmalloc.h> #include <linux/module.h> @@ -36757,7 +36950,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/mm/ioremap.c linux-2.6.17/arch/sh/mm/iore #ifdef CONFIG_32BIT diff -ruN linux-2.6.17-vanilla/arch/sh/mm/pg-sh4.c linux-2.6.17/arch/sh/mm/pg-sh4.c --- linux-2.6.17-vanilla/arch/sh/mm/pg-sh4.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/mm/pg-sh4.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/mm/pg-sh4.c 2006-07-07 10:17:07.000000000 +0000 @@ -2,7 +2,7 @@ * arch/sh/mm/pg-sh4.c * @@ -36826,7 +37019,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/mm/pg-sh4.c linux-2.6.17/arch/sh/mm/pg-sh unsigned long flags; diff -ruN linux-2.6.17-vanilla/arch/sh/mm/pmb.c linux-2.6.17/arch/sh/mm/pmb.c --- linux-2.6.17-vanilla/arch/sh/mm/pmb.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/mm/pmb.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/mm/pmb.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,404 @@ +/* + * arch/sh/mm/pmb.c @@ -37234,7 +37427,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/mm/pmb.c linux-2.6.17/arch/sh/mm/pmb.c +#endif diff -ruN linux-2.6.17-vanilla/arch/sh/mm/tlb-flush.c linux-2.6.17/arch/sh/mm/tlb-flush.c --- linux-2.6.17-vanilla/arch/sh/mm/tlb-flush.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/mm/tlb-flush.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/mm/tlb-flush.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,132 @@ +/* + * TLB flushing operations for SH with an MMU. @@ -37370,7 +37563,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/mm/tlb-flush.c linux-2.6.17/arch/sh/mm/tl +} diff -ruN linux-2.6.17-vanilla/arch/sh/mm/tlb-sh4.c linux-2.6.17/arch/sh/mm/tlb-sh4.c --- linux-2.6.17-vanilla/arch/sh/mm/tlb-sh4.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/mm/tlb-sh4.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/mm/tlb-sh4.c 2006-07-07 10:17:07.000000000 +0000 @@ -36,7 +36,6 @@ unsigned long vpn; struct page *page; @@ -37396,7 +37589,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/mm/tlb-sh4.c linux-2.6.17/arch/sh/mm/tlb- pteval &= _PAGE_FLAGS_HARDWARE_MASK; /* drop software flags */ diff -ruN linux-2.6.17-vanilla/arch/sh/oprofile/CVS/Entries linux-2.6.17/arch/sh/oprofile/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/oprofile/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/oprofile/CVS/Entries 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/oprofile/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,5 @@ +/Kconfig/1.1/Sun Oct 12 21:34:48 2003// +/Makefile/1.4/Sun Aug 21 23:08:54 2005// @@ -37405,17 +37598,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/oprofile/CVS/Entries linux-2.6.17/arch/sh +D diff -ruN linux-2.6.17-vanilla/arch/sh/oprofile/CVS/Repository linux-2.6.17/arch/sh/oprofile/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/oprofile/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/oprofile/CVS/Repository 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/oprofile/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/oprofile diff -ruN linux-2.6.17-vanilla/arch/sh/oprofile/CVS/Root linux-2.6.17/arch/sh/oprofile/CVS/Root --- linux-2.6.17-vanilla/arch/sh/oprofile/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/oprofile/CVS/Root 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/oprofile/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/oprofile/Makefile linux-2.6.17/arch/sh/oprofile/Makefile --- linux-2.6.17-vanilla/arch/sh/oprofile/Makefile 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/oprofile/Makefile 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/oprofile/Makefile 2006-07-07 10:17:07.000000000 +0000 @@ -7,7 +7,11 @@ timer_int.o ) @@ -37430,7 +37623,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/oprofile/Makefile linux-2.6.17/arch/sh/op diff -ruN linux-2.6.17-vanilla/arch/sh/tools/CVS/Entries linux-2.6.17/arch/sh/tools/CVS/Entries --- linux-2.6.17-vanilla/arch/sh/tools/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/tools/CVS/Entries 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/tools/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,4 @@ +/Makefile/1.2/Fri Sep 24 15:12:43 2004// +/gen-mach-types/1.1/Fri Sep 24 15:12:45 2004/-ko/ @@ -37438,17 +37631,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/tools/CVS/Entries linux-2.6.17/arch/sh/to +D diff -ruN linux-2.6.17-vanilla/arch/sh/tools/CVS/Repository linux-2.6.17/arch/sh/tools/CVS/Repository --- linux-2.6.17-vanilla/arch/sh/tools/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/tools/CVS/Repository 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/tools/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/arch/sh/tools diff -ruN linux-2.6.17-vanilla/arch/sh/tools/CVS/Root linux-2.6.17/arch/sh/tools/CVS/Root --- linux-2.6.17-vanilla/arch/sh/tools/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/arch/sh/tools/CVS/Root 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/tools/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/arch/sh/tools/mach-types linux-2.6.17/arch/sh/tools/mach-types --- linux-2.6.17-vanilla/arch/sh/tools/mach-types 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/arch/sh/tools/mach-types 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/arch/sh/tools/mach-types 2006-07-07 10:17:07.000000000 +0000 @@ -7,7 +7,7 @@ # SE SH_SOLUTION_ENGINE @@ -37469,7 +37662,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/tools/mach-types linux-2.6.17/arch/sh/too +TITAN SH_TITAN diff -ruN linux-2.6.17-vanilla/drivers/CVS/Entries linux-2.6.17/drivers/CVS/Entries --- linux-2.6.17-vanilla/drivers/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/CVS/Entries 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/drivers/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,11 @@ +D/char//// +D/i2c//// @@ -37484,17 +37677,17 @@ diff -ruN linux-2.6.17-vanilla/drivers/CVS/Entries linux-2.6.17/drivers/CVS/Entr +D/video//// diff -ruN linux-2.6.17-vanilla/drivers/CVS/Repository linux-2.6.17/drivers/CVS/Repository --- linux-2.6.17-vanilla/drivers/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/CVS/Repository 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/drivers/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/drivers diff -ruN linux-2.6.17-vanilla/drivers/CVS/Root linux-2.6.17/drivers/CVS/Root --- linux-2.6.17-vanilla/drivers/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/CVS/Root 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/drivers/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/drivers/char/CVS/Entries linux-2.6.17/drivers/char/CVS/Entries --- linux-2.6.17-vanilla/drivers/char/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/char/CVS/Entries 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/drivers/char/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,8 @@ +/rs5c313_rtc.c/1.1/Thu Sep 29 07:19:20 2005/-ko/ +/rtc.c/1.8/Mon Mar 27 21:06:14 2006/-ko/ @@ -37506,17 +37699,17 @@ diff -ruN linux-2.6.17-vanilla/drivers/char/CVS/Entries linux-2.6.17/drivers/cha +/sysrq.c/1.17/Wed Jul 5 14:50:59 2006/-ko/ diff -ruN linux-2.6.17-vanilla/drivers/char/CVS/Repository linux-2.6.17/drivers/char/CVS/Repository --- linux-2.6.17-vanilla/drivers/char/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/char/CVS/Repository 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/drivers/char/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/drivers/char diff -ruN linux-2.6.17-vanilla/drivers/char/CVS/Root linux-2.6.17/drivers/char/CVS/Root --- linux-2.6.17-vanilla/drivers/char/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/char/CVS/Root 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/drivers/char/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/drivers/char/Kconfig linux-2.6.17/drivers/char/Kconfig --- linux-2.6.17-vanilla/drivers/char/Kconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/char/Kconfig 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/drivers/char/Kconfig 2006-07-07 10:17:07.000000000 +0000 @@ -737,6 +737,22 @@ To compile this driver as a module, choose M here: the module will be called rtc. @@ -37542,7 +37735,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/char/Kconfig linux-2.6.17/drivers/char/Kc depends on SGI_IP22 diff -ruN linux-2.6.17-vanilla/drivers/char/Makefile linux-2.6.17/drivers/char/Makefile --- linux-2.6.17-vanilla/drivers/char/Makefile 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/char/Makefile 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/drivers/char/Makefile 2006-07-07 10:17:07.000000000 +0000 @@ -67,6 +67,9 @@ obj-$(CONFIG_SGI_IP27_RTC) += ip27-rtc.o obj-$(CONFIG_DS1302) += ds1302.o @@ -37555,7 +37748,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/char/Makefile linux-2.6.17/drivers/char/M else diff -ruN linux-2.6.17-vanilla/drivers/char/rs5c313_rtc.c linux-2.6.17/drivers/char/rs5c313_rtc.c --- linux-2.6.17-vanilla/drivers/char/rs5c313_rtc.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/char/rs5c313_rtc.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/drivers/char/rs5c313_rtc.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,855 @@ +/* + * RICHO RS5C313 Real Time Clock interface for Linux @@ -38414,7 +38607,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/char/rs5c313_rtc.c linux-2.6.17/drivers/c + diff -ruN linux-2.6.17-vanilla/drivers/char/rtc.c linux-2.6.17/drivers/char/rtc.c --- linux-2.6.17-vanilla/drivers/char/rtc.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/char/rtc.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/drivers/char/rtc.c 2006-07-07 10:17:07.000000000 +0000 @@ -104,7 +104,7 @@ #endif @@ -38426,7 +38619,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/char/rtc.c linux-2.6.17/drivers/char/rtc. #ifndef CONFIG_HPET_EMULATE_RTC diff -ruN linux-2.6.17-vanilla/drivers/char/rtc9701_rtc.c linux-2.6.17/drivers/char/rtc9701_rtc.c --- linux-2.6.17-vanilla/drivers/char/rtc9701_rtc.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/char/rtc9701_rtc.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/drivers/char/rtc9701_rtc.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,888 @@ +/* + * linux/drivers/char/rtc9701_rtc.c @@ -39318,7 +39511,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/char/rtc9701_rtc.c linux-2.6.17/drivers/c +module_exit(rtc9701_rtc_exit); diff -ruN linux-2.6.17-vanilla/drivers/char/sh03rtc.c linux-2.6.17/drivers/char/sh03rtc.c --- linux-2.6.17-vanilla/drivers/char/sh03rtc.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/char/sh03rtc.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/drivers/char/sh03rtc.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,1185 @@ +/* + * Real Time Clock interface for Linux @@ -40507,7 +40700,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/char/sh03rtc.c linux-2.6.17/drivers/char/ + diff -ruN linux-2.6.17-vanilla/drivers/char/sysrq.c linux-2.6.17/drivers/char/sysrq.c --- linux-2.6.17-vanilla/drivers/char/sysrq.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/char/sysrq.c 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/drivers/char/sysrq.c 2006-07-07 10:17:07.000000000 +0000 @@ -38,6 +38,18 @@ #include <linux/kexec.h> @@ -40538,39 +40731,39 @@ diff -ruN linux-2.6.17-vanilla/drivers/char/sysrq.c linux-2.6.17/drivers/char/sy NULL, /* j */ diff -ruN linux-2.6.17-vanilla/drivers/char/watchdog/CVS/Entries linux-2.6.17/drivers/char/watchdog/CVS/Entries --- linux-2.6.17-vanilla/drivers/char/watchdog/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/char/watchdog/CVS/Entries 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/drivers/char/watchdog/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,2 @@ +/shwdt.c/1.12/Mon Aug 29 21:01:18 2005/-ko/ +D diff -ruN linux-2.6.17-vanilla/drivers/char/watchdog/CVS/Repository linux-2.6.17/drivers/char/watchdog/CVS/Repository --- linux-2.6.17-vanilla/drivers/char/watchdog/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/char/watchdog/CVS/Repository 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/drivers/char/watchdog/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/drivers/char/watchdog diff -ruN linux-2.6.17-vanilla/drivers/char/watchdog/CVS/Root linux-2.6.17/drivers/char/watchdog/CVS/Root --- linux-2.6.17-vanilla/drivers/char/watchdog/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/char/watchdog/CVS/Root 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/drivers/char/watchdog/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/drivers/i2c/CVS/Entries linux-2.6.17/drivers/i2c/CVS/Entries --- linux-2.6.17-vanilla/drivers/i2c/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/i2c/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/i2c/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,2 @@ +D/algos//// +D/busses//// diff -ruN linux-2.6.17-vanilla/drivers/i2c/CVS/Repository linux-2.6.17/drivers/i2c/CVS/Repository --- linux-2.6.17-vanilla/drivers/i2c/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/i2c/CVS/Repository 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/drivers/i2c/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/drivers/i2c diff -ruN linux-2.6.17-vanilla/drivers/i2c/CVS/Root linux-2.6.17/drivers/i2c/CVS/Root --- linux-2.6.17-vanilla/drivers/i2c/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/i2c/CVS/Root 2006-07-06 12:42:56.000000000 +0000 ++++ linux-2.6.17/drivers/i2c/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/drivers/i2c/algos/CVS/Entries linux-2.6.17/drivers/i2c/algos/CVS/Entries --- linux-2.6.17-vanilla/drivers/i2c/algos/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/i2c/algos/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/i2c/algos/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,5 @@ +/Kconfig/1.3/Wed Mar 2 13:02:57 2005/-ko/ +/Makefile/1.3/Wed Mar 2 13:02:57 2005/-ko/ @@ -40579,17 +40772,17 @@ diff -ruN linux-2.6.17-vanilla/drivers/i2c/algos/CVS/Entries linux-2.6.17/driver +D diff -ruN linux-2.6.17-vanilla/drivers/i2c/algos/CVS/Repository linux-2.6.17/drivers/i2c/algos/CVS/Repository --- linux-2.6.17-vanilla/drivers/i2c/algos/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/i2c/algos/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/i2c/algos/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/drivers/i2c/algos diff -ruN linux-2.6.17-vanilla/drivers/i2c/algos/CVS/Root linux-2.6.17/drivers/i2c/algos/CVS/Root --- linux-2.6.17-vanilla/drivers/i2c/algos/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/i2c/algos/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/i2c/algos/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/drivers/i2c/algos/Kconfig linux-2.6.17/drivers/i2c/algos/Kconfig --- linux-2.6.17-vanilla/drivers/i2c/algos/Kconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/i2c/algos/Kconfig 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/i2c/algos/Kconfig 2006-07-07 10:17:07.000000000 +0000 @@ -53,6 +53,10 @@ tristate "MPC8xx CPM I2C interface" depends on 8xx && I2C @@ -40603,7 +40796,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/i2c/algos/Kconfig linux-2.6.17/drivers/i2 depends on SIBYTE_SB1xxx_SOC && I2C diff -ruN linux-2.6.17-vanilla/drivers/i2c/algos/Makefile linux-2.6.17/drivers/i2c/algos/Makefile --- linux-2.6.17-vanilla/drivers/i2c/algos/Makefile 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/i2c/algos/Makefile 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/i2c/algos/Makefile 2006-07-07 10:17:07.000000000 +0000 @@ -6,6 +6,7 @@ obj-$(CONFIG_I2C_ALGOPCF) += i2c-algo-pcf.o obj-$(CONFIG_I2C_ALGOPCA) += i2c-algo-pca.o @@ -40614,7 +40807,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/i2c/algos/Makefile linux-2.6.17/drivers/i diff -ruN linux-2.6.17-vanilla/drivers/i2c/algos/i2c-algo-voyager.c linux-2.6.17/drivers/i2c/algos/i2c-algo-voyager.c --- linux-2.6.17-vanilla/drivers/i2c/algos/i2c-algo-voyager.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/i2c/algos/i2c-algo-voyager.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/i2c/algos/i2c-algo-voyager.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,415 @@ +/* -------------------------------------------------------------------- */ +/* i2c-algo-voyagergx.c: */ @@ -41033,7 +41226,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/i2c/algos/i2c-algo-voyager.c linux-2.6.17 +module_exit(i2c_algo_iic_exit); diff -ruN linux-2.6.17-vanilla/drivers/i2c/algos/i2c-algo-voyager.h linux-2.6.17/drivers/i2c/algos/i2c-algo-voyager.h --- linux-2.6.17-vanilla/drivers/i2c/algos/i2c-algo-voyager.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/i2c/algos/i2c-algo-voyager.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/i2c/algos/i2c-algo-voyager.h 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,99 @@ +/* ------------------------------------------------------------------------- */ +/* i2c-algo-ite.h i2c driver algorithms for ITE IIC adapters */ @@ -41136,7 +41329,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/i2c/algos/i2c-algo-voyager.h linux-2.6.17 +#endif /* I2C_ALGO_ITE_H */ diff -ruN linux-2.6.17-vanilla/drivers/i2c/busses/CVS/Entries linux-2.6.17/drivers/i2c/busses/CVS/Entries --- linux-2.6.17-vanilla/drivers/i2c/busses/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/i2c/busses/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/i2c/busses/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,4 @@ +/Makefile/1.9/Mon Mar 27 21:06:14 2006/-ko/ +/i2c-voyager.c/1.1/Wed Apr 21 00:09:16 2004/-ko/ @@ -41144,17 +41337,17 @@ diff -ruN linux-2.6.17-vanilla/drivers/i2c/busses/CVS/Entries linux-2.6.17/drive +D diff -ruN linux-2.6.17-vanilla/drivers/i2c/busses/CVS/Repository linux-2.6.17/drivers/i2c/busses/CVS/Repository --- linux-2.6.17-vanilla/drivers/i2c/busses/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/i2c/busses/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/i2c/busses/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/drivers/i2c/busses diff -ruN linux-2.6.17-vanilla/drivers/i2c/busses/CVS/Root linux-2.6.17/drivers/i2c/busses/CVS/Root --- linux-2.6.17-vanilla/drivers/i2c/busses/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/i2c/busses/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/i2c/busses/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/drivers/i2c/busses/Kconfig linux-2.6.17/drivers/i2c/busses/Kconfig --- linux-2.6.17-vanilla/drivers/i2c/busses/Kconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/i2c/busses/Kconfig 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/i2c/busses/Kconfig 2006-07-07 10:17:07.000000000 +0000 @@ -496,6 +496,16 @@ This driver can also be built as a module. If so, the module will be called i2c-voodoo3. @@ -41174,7 +41367,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/i2c/busses/Kconfig linux-2.6.17/drivers/i depends on I2C diff -ruN linux-2.6.17-vanilla/drivers/i2c/busses/Makefile linux-2.6.17/drivers/i2c/busses/Makefile --- linux-2.6.17-vanilla/drivers/i2c/busses/Makefile 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/i2c/busses/Makefile 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/i2c/busses/Makefile 2006-07-07 10:17:07.000000000 +0000 @@ -40,6 +40,7 @@ obj-$(CONFIG_I2C_VIA) += i2c-via.o obj-$(CONFIG_I2C_VIAPRO) += i2c-viapro.o @@ -41185,7 +41378,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/i2c/busses/Makefile linux-2.6.17/drivers/ diff -ruN linux-2.6.17-vanilla/drivers/i2c/busses/i2c-voyager.c linux-2.6.17/drivers/i2c/busses/i2c-voyager.c --- linux-2.6.17-vanilla/drivers/i2c/busses/i2c-voyager.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/i2c/busses/i2c-voyager.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/i2c/busses/i2c-voyager.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,216 @@ +/* -------------------------------------------------------------------- */ +/* i2c-voyagergx.c: */ @@ -41405,7 +41598,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/i2c/busses/i2c-voyager.c linux-2.6.17/dri + diff -ruN linux-2.6.17-vanilla/drivers/ide/CVS/Entries linux-2.6.17/drivers/ide/CVS/Entries --- linux-2.6.17-vanilla/drivers/ide/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/ide/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/ide/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,6 @@ +/Kconfig/1.28/Mon Mar 27 21:06:14 2006/-ko/ +/Makefile/1.7/Tue Jan 3 22:35:55 2006/-ko/ @@ -41415,17 +41608,17 @@ diff -ruN linux-2.6.17-vanilla/drivers/ide/CVS/Entries linux-2.6.17/drivers/ide/ +/ide.c/1.11/Wed Jul 5 14:51:04 2006/-ko/ diff -ruN linux-2.6.17-vanilla/drivers/ide/CVS/Repository linux-2.6.17/drivers/ide/CVS/Repository --- linux-2.6.17-vanilla/drivers/ide/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/ide/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/ide/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/drivers/ide diff -ruN linux-2.6.17-vanilla/drivers/ide/CVS/Root linux-2.6.17/drivers/ide/CVS/Root --- linux-2.6.17-vanilla/drivers/ide/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/ide/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/ide/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/drivers/ide/Kconfig linux-2.6.17/drivers/ide/Kconfig --- linux-2.6.17-vanilla/drivers/ide/Kconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/ide/Kconfig 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/ide/Kconfig 2006-07-07 10:17:07.000000000 +0000 @@ -780,6 +780,9 @@ This option enables the use of the sleep LED as a hard drive activity LED. @@ -41438,7 +41631,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/ide/Kconfig linux-2.6.17/drivers/ide/Kcon depends on SIBYTE_SB1xxx_SOC diff -ruN linux-2.6.17-vanilla/drivers/ide/Makefile linux-2.6.17/drivers/ide/Makefile --- linux-2.6.17-vanilla/drivers/ide/Makefile 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/ide/Makefile 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/ide/Makefile 2006-07-07 10:17:07.000000000 +0000 @@ -37,6 +37,8 @@ ide-core-$(CONFIG_BLK_DEV_MPC8xx_IDE) += ppc/mpc8xx.o ide-core-$(CONFIG_BLK_DEV_IDE_PMAC) += ppc/pmac.o @@ -41450,7 +41643,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/ide/Makefile linux-2.6.17/drivers/ide/Mak diff -ruN linux-2.6.17-vanilla/drivers/ide/ide.c linux-2.6.17/drivers/ide/ide.c --- linux-2.6.17-vanilla/drivers/ide/ide.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/ide/ide.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/ide/ide.c 2006-07-07 10:17:07.000000000 +0000 @@ -1776,6 +1776,7 @@ extern void pnpide_init(void); @@ -41471,23 +41664,23 @@ diff -ruN linux-2.6.17-vanilla/drivers/ide/ide.c linux-2.6.17/drivers/ide/ide.c void ide_register_subdriver(ide_drive_t *drive, ide_driver_t *driver) diff -ruN linux-2.6.17-vanilla/drivers/ide/legacy/CVS/Entries linux-2.6.17/drivers/ide/legacy/CVS/Entries --- linux-2.6.17-vanilla/drivers/ide/legacy/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/ide/legacy/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/ide/legacy/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,2 @@ +/ide-cs.c/1.13/Thu Jul 6 12:38:14 2006// +D diff -ruN linux-2.6.17-vanilla/drivers/ide/legacy/CVS/Repository linux-2.6.17/drivers/ide/legacy/CVS/Repository --- linux-2.6.17-vanilla/drivers/ide/legacy/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/ide/legacy/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/ide/legacy/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/drivers/ide/legacy diff -ruN linux-2.6.17-vanilla/drivers/ide/legacy/CVS/Root linux-2.6.17/drivers/ide/legacy/CVS/Root --- linux-2.6.17-vanilla/drivers/ide/legacy/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/ide/legacy/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/ide/legacy/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/drivers/ide/legacy/ide-cs.c linux-2.6.17/drivers/ide/legacy/ide-cs.c --- linux-2.6.17-vanilla/drivers/ide/legacy/ide-cs.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/ide/legacy/ide-cs.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/ide/legacy/ide-cs.c 2006-07-07 10:17:07.000000000 +0000 @@ -73,6 +73,11 @@ #define DEBUG(n, args...) #endif @@ -41587,23 +41780,23 @@ diff -ruN linux-2.6.17-vanilla/drivers/ide/legacy/ide-cs.c linux-2.6.17/drivers/ pcmcia_disable_device(link); diff -ruN linux-2.6.17-vanilla/drivers/ide/pci/CVS/Entries linux-2.6.17/drivers/ide/pci/CVS/Entries --- linux-2.6.17-vanilla/drivers/ide/pci/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/ide/pci/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/ide/pci/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,2 @@ +/alim15x3.c/1.16/Wed Jul 5 14:51:05 2006/-ko/ +D diff -ruN linux-2.6.17-vanilla/drivers/ide/pci/CVS/Repository linux-2.6.17/drivers/ide/pci/CVS/Repository --- linux-2.6.17-vanilla/drivers/ide/pci/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/ide/pci/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/ide/pci/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/drivers/ide/pci diff -ruN linux-2.6.17-vanilla/drivers/ide/pci/CVS/Root linux-2.6.17/drivers/ide/pci/CVS/Root --- linux-2.6.17-vanilla/drivers/ide/pci/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/ide/pci/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/ide/pci/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/drivers/ide/pci/alim15x3.c linux-2.6.17/drivers/ide/pci/alim15x3.c --- linux-2.6.17-vanilla/drivers/ide/pci/alim15x3.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/ide/pci/alim15x3.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/ide/pci/alim15x3.c 2006-07-07 10:17:07.000000000 +0000 @@ -65,6 +65,16 @@ "PIO mode" }; @@ -41654,23 +41847,23 @@ diff -ruN linux-2.6.17-vanilla/drivers/ide/pci/alim15x3.c linux-2.6.17/drivers/i * is the highest permitted mode diff -ruN linux-2.6.17-vanilla/drivers/ide/sh/CVS/Entries linux-2.6.17/drivers/ide/sh/CVS/Entries --- linux-2.6.17-vanilla/drivers/ide/sh/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/ide/sh/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/ide/sh/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,2 @@ +/ide-sh.c/1.2/Thu Mar 17 10:26:58 2005/-ko/ +D diff -ruN linux-2.6.17-vanilla/drivers/ide/sh/CVS/Repository linux-2.6.17/drivers/ide/sh/CVS/Repository --- linux-2.6.17-vanilla/drivers/ide/sh/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/ide/sh/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/ide/sh/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/drivers/ide/sh diff -ruN linux-2.6.17-vanilla/drivers/ide/sh/CVS/Root linux-2.6.17/drivers/ide/sh/CVS/Root --- linux-2.6.17-vanilla/drivers/ide/sh/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/ide/sh/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/ide/sh/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/drivers/ide/sh/ide-sh.c linux-2.6.17/drivers/ide/sh/ide-sh.c --- linux-2.6.17-vanilla/drivers/ide/sh/ide-sh.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/ide/sh/ide-sh.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/ide/sh/ide-sh.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,95 @@ +/* + * SuperH default IDE host driver @@ -41769,23 +41962,23 @@ diff -ruN linux-2.6.17-vanilla/drivers/ide/sh/ide-sh.c linux-2.6.17/drivers/ide/ + diff -ruN linux-2.6.17-vanilla/drivers/input/CVS/Entries linux-2.6.17/drivers/input/CVS/Entries --- linux-2.6.17-vanilla/drivers/input/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/input/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/input/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,2 @@ +D/keyboard//// +D/touchscreen//// diff -ruN linux-2.6.17-vanilla/drivers/input/CVS/Repository linux-2.6.17/drivers/input/CVS/Repository --- linux-2.6.17-vanilla/drivers/input/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/input/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/input/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/drivers/input diff -ruN linux-2.6.17-vanilla/drivers/input/CVS/Root linux-2.6.17/drivers/input/CVS/Root --- linux-2.6.17-vanilla/drivers/input/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/input/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/input/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/drivers/input/keyboard/CVS/Entries linux-2.6.17/drivers/input/keyboard/CVS/Entries --- linux-2.6.17-vanilla/drivers/input/keyboard/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/input/keyboard/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/input/keyboard/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,7 @@ +/Makefile/1.6/Thu Nov 10 14:20:52 2005/-ko/ +/hp620_keyb.c/1.2/Mon Jan 30 11:14:01 2006// @@ -41796,17 +41989,17 @@ diff -ruN linux-2.6.17-vanilla/drivers/input/keyboard/CVS/Entries linux-2.6.17/d +D diff -ruN linux-2.6.17-vanilla/drivers/input/keyboard/CVS/Repository linux-2.6.17/drivers/input/keyboard/CVS/Repository --- linux-2.6.17-vanilla/drivers/input/keyboard/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/input/keyboard/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/input/keyboard/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/drivers/input/keyboard diff -ruN linux-2.6.17-vanilla/drivers/input/keyboard/CVS/Root linux-2.6.17/drivers/input/keyboard/CVS/Root --- linux-2.6.17-vanilla/drivers/input/keyboard/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/input/keyboard/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/input/keyboard/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/drivers/input/keyboard/Kconfig linux-2.6.17/drivers/input/keyboard/Kconfig --- linux-2.6.17-vanilla/drivers/input/keyboard/Kconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/input/keyboard/Kconfig 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/input/keyboard/Kconfig 2006-07-07 10:17:07.000000000 +0000 @@ -183,4 +183,21 @@ This driver implements support for HIL-keyboards attached to your machine, so normally you should say Y here. @@ -41831,7 +42024,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/input/keyboard/Kconfig linux-2.6.17/drive endif diff -ruN linux-2.6.17-vanilla/drivers/input/keyboard/Makefile linux-2.6.17/drivers/input/keyboard/Makefile --- linux-2.6.17-vanilla/drivers/input/keyboard/Makefile 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/input/keyboard/Makefile 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/input/keyboard/Makefile 2006-07-07 10:17:07.000000000 +0000 @@ -11,8 +11,11 @@ obj-$(CONFIG_KEYBOARD_AMIGA) += amikbd.o obj-$(CONFIG_KEYBOARD_LOCOMO) += locomokbd.o @@ -41846,7 +42039,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/input/keyboard/Makefile linux-2.6.17/driv diff -ruN linux-2.6.17-vanilla/drivers/input/keyboard/hp620_keyb.c linux-2.6.17/drivers/input/keyboard/hp620_keyb.c --- linux-2.6.17-vanilla/drivers/input/keyboard/hp620_keyb.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/input/keyboard/hp620_keyb.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/input/keyboard/hp620_keyb.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,169 @@ +/* + * drivers/input/keyboard/hp680_keyb.c @@ -42019,7 +42212,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/input/keyboard/hp620_keyb.c linux-2.6.17/ +MODULE_LICENSE("GPL"); diff -ruN linux-2.6.17-vanilla/drivers/input/keyboard/hp680_keyb.c linux-2.6.17/drivers/input/keyboard/hp680_keyb.c --- linux-2.6.17-vanilla/drivers/input/keyboard/hp680_keyb.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/input/keyboard/hp680_keyb.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/input/keyboard/hp680_keyb.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,152 @@ +/* + * drivers/input/keyboard/hp680_keyb.c @@ -42175,7 +42368,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/input/keyboard/hp680_keyb.c linux-2.6.17/ +MODULE_LICENSE("GPL"); diff -ruN linux-2.6.17-vanilla/drivers/input/keyboard/scan_keyb.c linux-2.6.17/drivers/input/keyboard/scan_keyb.c --- linux-2.6.17-vanilla/drivers/input/keyboard/scan_keyb.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/input/keyboard/scan_keyb.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/input/keyboard/scan_keyb.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,148 @@ +/* + * Generic scan keyboard driver @@ -42327,7 +42520,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/input/keyboard/scan_keyb.c linux-2.6.17/d +EXPORT_SYMBOL_GPL(unregister_scan_keyboard); diff -ruN linux-2.6.17-vanilla/drivers/input/keyboard/scan_keyb.h linux-2.6.17/drivers/input/keyboard/scan_keyb.h --- linux-2.6.17-vanilla/drivers/input/keyboard/scan_keyb.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/input/keyboard/scan_keyb.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/input/keyboard/scan_keyb.h 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,16 @@ +#ifndef __DRIVER_CHAR_SCAN_KEYB_H +#define __DRIVER_CHAR_SCAN_KEYB_H @@ -42347,23 +42540,23 @@ diff -ruN linux-2.6.17-vanilla/drivers/input/keyboard/scan_keyb.h linux-2.6.17/d +#endif diff -ruN linux-2.6.17-vanilla/drivers/input/touchscreen/CVS/Entries linux-2.6.17/drivers/input/touchscreen/CVS/Entries --- linux-2.6.17-vanilla/drivers/input/touchscreen/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/input/touchscreen/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/input/touchscreen/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,2 @@ +/hp680_ts_input.c/1.3/Sun Jan 29 22:13:39 2006/-ko/ +D diff -ruN linux-2.6.17-vanilla/drivers/input/touchscreen/CVS/Repository linux-2.6.17/drivers/input/touchscreen/CVS/Repository --- linux-2.6.17-vanilla/drivers/input/touchscreen/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/input/touchscreen/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/input/touchscreen/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/drivers/input/touchscreen diff -ruN linux-2.6.17-vanilla/drivers/input/touchscreen/CVS/Root linux-2.6.17/drivers/input/touchscreen/CVS/Root --- linux-2.6.17-vanilla/drivers/input/touchscreen/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/input/touchscreen/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/input/touchscreen/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/drivers/input/touchscreen/hp680_ts_input.c linux-2.6.17/drivers/input/touchscreen/hp680_ts_input.c --- linux-2.6.17-vanilla/drivers/input/touchscreen/hp680_ts_input.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/input/touchscreen/hp680_ts_input.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/input/touchscreen/hp680_ts_input.c 2006-07-07 10:17:07.000000000 +0000 @@ -15,7 +15,6 @@ #define HP680_TS_ABS_Y_MIN 80 #define HP680_TS_ABS_Y_MAX 910 @@ -42394,23 +42587,23 @@ diff -ruN linux-2.6.17-vanilla/drivers/input/touchscreen/hp680_ts_input.c linux- return -ENOMEM; diff -ruN linux-2.6.17-vanilla/drivers/mtd/CVS/Entries linux-2.6.17/drivers/mtd/CVS/Entries --- linux-2.6.17-vanilla/drivers/mtd/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/mtd/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/mtd/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,2 @@ +/mtdpart.c/1.11/Tue Jan 3 22:35:56 2006/-ko/ +D/maps//// diff -ruN linux-2.6.17-vanilla/drivers/mtd/CVS/Repository linux-2.6.17/drivers/mtd/CVS/Repository --- linux-2.6.17-vanilla/drivers/mtd/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/mtd/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/mtd/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/drivers/mtd diff -ruN linux-2.6.17-vanilla/drivers/mtd/CVS/Root linux-2.6.17/drivers/mtd/CVS/Root --- linux-2.6.17-vanilla/drivers/mtd/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/mtd/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/mtd/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/drivers/mtd/maps/CVS/Entries linux-2.6.17/drivers/mtd/maps/CVS/Entries --- linux-2.6.17-vanilla/drivers/mtd/maps/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/mtd/maps/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/mtd/maps/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,5 @@ +/Kconfig/1.18/Mon Mar 27 21:06:14 2006/-ko/ +/Makefile/1.16/Mon Mar 27 21:06:14 2006/-ko/ @@ -42419,17 +42612,17 @@ diff -ruN linux-2.6.17-vanilla/drivers/mtd/maps/CVS/Entries linux-2.6.17/drivers +D diff -ruN linux-2.6.17-vanilla/drivers/mtd/maps/CVS/Repository linux-2.6.17/drivers/mtd/maps/CVS/Repository --- linux-2.6.17-vanilla/drivers/mtd/maps/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/mtd/maps/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/mtd/maps/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/drivers/mtd/maps diff -ruN linux-2.6.17-vanilla/drivers/mtd/maps/CVS/Root linux-2.6.17/drivers/mtd/maps/CVS/Root --- linux-2.6.17-vanilla/drivers/mtd/maps/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/mtd/maps/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/mtd/maps/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/drivers/mtd/maps/Kconfig linux-2.6.17/drivers/mtd/maps/Kconfig --- linux-2.6.17-vanilla/drivers/mtd/maps/Kconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/mtd/maps/Kconfig 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/mtd/maps/Kconfig 2006-07-07 10:17:07.000000000 +0000 @@ -409,11 +409,37 @@ config MTD_SOLUTIONENGINE @@ -42471,7 +42664,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/mtd/maps/Kconfig linux-2.6.17/drivers/mtd depends on ARM && MTD_CFI diff -ruN linux-2.6.17-vanilla/drivers/mtd/maps/Makefile linux-2.6.17/drivers/mtd/maps/Makefile --- linux-2.6.17-vanilla/drivers/mtd/maps/Makefile 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/mtd/maps/Makefile 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/mtd/maps/Makefile 2006-07-07 10:17:07.000000000 +0000 @@ -62,6 +62,7 @@ obj-$(CONFIG_MTD_SBC8240) += sbc8240.o obj-$(CONFIG_MTD_NOR_TOTO) += omap-toto-flash.o @@ -42489,7 +42682,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/mtd/maps/Makefile linux-2.6.17/drivers/mt obj-$(CONFIG_MTD_TQM834x) += tqm834x.o diff -ruN linux-2.6.17-vanilla/drivers/mtd/maps/microdev-flash.c linux-2.6.17/drivers/mtd/maps/microdev-flash.c --- linux-2.6.17-vanilla/drivers/mtd/maps/microdev-flash.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/mtd/maps/microdev-flash.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/mtd/maps/microdev-flash.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,165 @@ +/* + * drivers/mtd/maps/microdev-flash.c @@ -42658,7 +42851,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/mtd/maps/microdev-flash.c linux-2.6.17/dr + diff -ruN linux-2.6.17-vanilla/drivers/mtd/maps/rts7751r2d-flash.c linux-2.6.17/drivers/mtd/maps/rts7751r2d-flash.c --- linux-2.6.17-vanilla/drivers/mtd/maps/rts7751r2d-flash.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/mtd/maps/rts7751r2d-flash.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/mtd/maps/rts7751r2d-flash.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,167 @@ +/* -------------------------------------------------------------------- */ +/* rts7751r2d-flash.c: */ @@ -42829,7 +43022,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/mtd/maps/rts7751r2d-flash.c linux-2.6.17/ +MODULE_DESCRIPTION("MTD map driver for RTS7751R2D base board"); diff -ruN linux-2.6.17-vanilla/drivers/mtd/mtdpart.c linux-2.6.17/drivers/mtd/mtdpart.c --- linux-2.6.17-vanilla/drivers/mtd/mtdpart.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/mtd/mtdpart.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/mtd/mtdpart.c 2006-07-07 10:17:07.000000000 +0000 @@ -481,6 +481,14 @@ printk (KERN_NOTICE "0x%08x-0x%08x : \"%s\"\n", slave->offset, slave->offset + slave->mtd.size, slave->mtd.name); @@ -42847,7 +43040,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/mtd/mtdpart.c linux-2.6.17/drivers/mtd/mt /* let's register it anyway to preserve ordering */ diff -ruN linux-2.6.17-vanilla/drivers/net/8139too.c linux-2.6.17/drivers/net/8139too.c --- linux-2.6.17-vanilla/drivers/net/8139too.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/net/8139too.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/net/8139too.c 2006-07-07 10:17:07.000000000 +0000 @@ -257,7 +257,7 @@ {0x018a, 0x0106, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 }, {0x126c, 0x1211, PCI_ANY_ID, PCI_ANY_ID, 0, 0, RTL8139 }, @@ -42877,7 +43070,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/net/8139too.c linux-2.6.17/drivers/net/81 dev->open = rtl8139_open; diff -ruN linux-2.6.17-vanilla/drivers/net/8390.c linux-2.6.17/drivers/net/8390.c --- linux-2.6.17-vanilla/drivers/net/8390.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/net/8390.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/net/8390.c 2006-07-07 10:17:07.000000000 +0000 @@ -108,6 +108,13 @@ int ei_debug = 1; #endif @@ -42968,7 +43161,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/net/8390.c linux-2.6.17/drivers/net/8390. } diff -ruN linux-2.6.17-vanilla/drivers/net/88796l.c linux-2.6.17/drivers/net/88796l.c --- linux-2.6.17-vanilla/drivers/net/88796l.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/net/88796l.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/net/88796l.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,95 @@ +#define NE_EEPROM 0x14 + @@ -43067,7 +43260,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/net/88796l.c linux-2.6.17/drivers/net/887 +} diff -ruN linux-2.6.17-vanilla/drivers/net/CVS/Entries linux-2.6.17/drivers/net/CVS/Entries --- linux-2.6.17-vanilla/drivers/net/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/net/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/net/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,7 @@ +/8390.c/1.9/Sat Jan 7 20:02:47 2006/-ko/ +/88796l.c/1.1/Sat Jan 7 20:02:47 2006/-ko/ @@ -43078,17 +43271,17 @@ diff -ruN linux-2.6.17-vanilla/drivers/net/CVS/Entries linux-2.6.17/drivers/net/ +D diff -ruN linux-2.6.17-vanilla/drivers/net/CVS/Repository linux-2.6.17/drivers/net/CVS/Repository --- linux-2.6.17-vanilla/drivers/net/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/net/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/net/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/drivers/net diff -ruN linux-2.6.17-vanilla/drivers/net/CVS/Root linux-2.6.17/drivers/net/CVS/Root --- linux-2.6.17-vanilla/drivers/net/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/net/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/net/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/drivers/net/Kconfig linux-2.6.17/drivers/net/Kconfig --- linux-2.6.17-vanilla/drivers/net/Kconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/net/Kconfig 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/net/Kconfig 2006-07-07 10:17:07.000000000 +0000 @@ -1078,7 +1078,7 @@ config NE2000 @@ -43100,7 +43293,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/net/Kconfig linux-2.6.17/drivers/net/Kcon If you have a network (Ethernet) card of this type, say Y and read diff -ruN linux-2.6.17-vanilla/drivers/net/ne.c linux-2.6.17/drivers/net/ne.c --- linux-2.6.17-vanilla/drivers/net/ne.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/net/ne.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/net/ne.c 2006-07-07 10:17:07.000000000 +0000 @@ -142,6 +142,10 @@ #elif defined(CONFIG_PLAT_OAKS32R) || \ defined(CONFIG_TOSHIBA_RBTX4927) || defined(CONFIG_TOSHIBA_RBTX4938) @@ -43181,7 +43374,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/net/ne.c linux-2.6.17/drivers/net/ne.c { diff -ruN linux-2.6.17-vanilla/drivers/net/stnic.c linux-2.6.17/drivers/net/stnic.c --- linux-2.6.17-vanilla/drivers/net/stnic.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/net/stnic.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/net/stnic.c 2006-07-07 10:17:07.000000000 +0000 @@ -20,7 +20,7 @@ #include <asm/system.h> @@ -43193,7 +43386,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/net/stnic.c linux-2.6.17/drivers/net/stni #include <asm/sh_bios.h> diff -ruN linux-2.6.17-vanilla/drivers/pcmcia/CVS/Entries linux-2.6.17/drivers/pcmcia/CVS/Entries --- linux-2.6.17-vanilla/drivers/pcmcia/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/pcmcia/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/pcmcia/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,5 @@ +/hd64461_ss.c/1.16/Mon Mar 27 23:59:10 2006/-ko/ +/yenta_socket.c/1.13/Mon Mar 27 21:06:14 2006/-ko/ @@ -43202,17 +43395,17 @@ diff -ruN linux-2.6.17-vanilla/drivers/pcmcia/CVS/Entries linux-2.6.17/drivers/p +D diff -ruN linux-2.6.17-vanilla/drivers/pcmcia/CVS/Repository linux-2.6.17/drivers/pcmcia/CVS/Repository --- linux-2.6.17-vanilla/drivers/pcmcia/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/pcmcia/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/pcmcia/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/drivers/pcmcia diff -ruN linux-2.6.17-vanilla/drivers/pcmcia/CVS/Root linux-2.6.17/drivers/pcmcia/CVS/Root --- linux-2.6.17-vanilla/drivers/pcmcia/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/pcmcia/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/pcmcia/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/drivers/pcmcia/Kconfig linux-2.6.17/drivers/pcmcia/Kconfig --- linux-2.6.17-vanilla/drivers/pcmcia/Kconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/pcmcia/Kconfig 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/pcmcia/Kconfig 2006-07-07 10:17:07.000000000 +0000 @@ -179,6 +179,19 @@ "Bridge" is the name used for the hardware inside your computer that PCMCIA cards are plugged into. If unsure, say N. @@ -43246,7 +43439,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/pcmcia/Kconfig linux-2.6.17/drivers/pcmci depends on SOC_AU1X00 && PCMCIA diff -ruN linux-2.6.17-vanilla/drivers/pcmcia/Makefile linux-2.6.17/drivers/pcmcia/Makefile --- linux-2.6.17-vanilla/drivers/pcmcia/Makefile 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/pcmcia/Makefile 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/pcmcia/Makefile 2006-07-07 10:17:07.000000000 +0000 @@ -25,8 +25,9 @@ obj-$(CONFIG_I82365) += i82365.o obj-$(CONFIG_I82092) += i82092.o @@ -43260,7 +43453,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/pcmcia/Makefile linux-2.6.17/drivers/pcmc obj-$(CONFIG_PCMCIA_PXA2XX) += pxa2xx_core.o pxa2xx_cs.o diff -ruN linux-2.6.17-vanilla/drivers/pcmcia/hd64461_ss.c linux-2.6.17/drivers/pcmcia/hd64461_ss.c --- linux-2.6.17-vanilla/drivers/pcmcia/hd64461_ss.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/pcmcia/hd64461_ss.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/pcmcia/hd64461_ss.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,679 @@ +/* + * drivers/pcmcia/hd64461_ss.c @@ -43943,7 +44136,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/pcmcia/hd64461_ss.c linux-2.6.17/drivers/ +MODULE_LICENSE("GPL"); diff -ruN linux-2.6.17-vanilla/drivers/pcmcia/yenta_socket.c linux-2.6.17/drivers/pcmcia/yenta_socket.c --- linux-2.6.17-vanilla/drivers/pcmcia/yenta_socket.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/pcmcia/yenta_socket.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/pcmcia/yenta_socket.c 2006-07-07 10:17:07.000000000 +0000 @@ -49,6 +49,15 @@ #define to_cycles(ns) ((ns)/120) #define to_ns(cycles) ((cycles)*120) @@ -44014,7 +44207,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/pcmcia/yenta_socket.c linux-2.6.17/driver /* diff -ruN linux-2.6.17-vanilla/drivers/serial/8250.c linux-2.6.17/drivers/serial/8250.c --- linux-2.6.17-vanilla/drivers/serial/8250.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/serial/8250.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/serial/8250.c 2006-07-07 10:17:07.000000000 +0000 @@ -193,6 +193,9 @@ .fifo_size = 32, .tx_loadsz = 16, @@ -44059,7 +44252,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/serial/8250.c linux-2.6.17/drivers/serial diff -ruN linux-2.6.17-vanilla/drivers/serial/CVS/Entries linux-2.6.17/drivers/serial/CVS/Entries --- linux-2.6.17-vanilla/drivers/serial/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/serial/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/serial/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,4 @@ +/sh-sci.c/1.43/Mon Mar 27 21:06:14 2006/-ko/ +/sh-sci.h/1.21/Wed Feb 8 12:24:41 2006/-ko/ @@ -44067,17 +44260,17 @@ diff -ruN linux-2.6.17-vanilla/drivers/serial/CVS/Entries linux-2.6.17/drivers/s +D diff -ruN linux-2.6.17-vanilla/drivers/serial/CVS/Repository linux-2.6.17/drivers/serial/CVS/Repository --- linux-2.6.17-vanilla/drivers/serial/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/serial/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/serial/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/drivers/serial diff -ruN linux-2.6.17-vanilla/drivers/serial/CVS/Root linux-2.6.17/drivers/serial/CVS/Root --- linux-2.6.17-vanilla/drivers/serial/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/serial/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/serial/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/drivers/serial/sh-sci.c linux-2.6.17/drivers/serial/sh-sci.c --- linux-2.6.17-vanilla/drivers/serial/sh-sci.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/serial/sh-sci.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/serial/sh-sci.c 2006-07-07 10:17:07.000000000 +0000 @@ -3,7 +3,7 @@ * * SuperH on-chip serial module support. (SCI with no FIFO / with FIFO) @@ -44655,7 +44848,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/serial/sh-sci.c linux-2.6.17/drivers/seri +MODULE_LICENSE("GPL"); diff -ruN linux-2.6.17-vanilla/drivers/serial/sh-sci.h linux-2.6.17/drivers/serial/sh-sci.h --- linux-2.6.17-vanilla/drivers/serial/sh-sci.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/serial/sh-sci.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/serial/sh-sci.h 2006-07-07 10:17:07.000000000 +0000 @@ -279,6 +279,8 @@ int type; unsigned char irqs[4]; /* ERI, RXI, TXI, BRI */ @@ -44667,23 +44860,23 @@ diff -ruN linux-2.6.17-vanilla/drivers/serial/sh-sci.h linux-2.6.17/drivers/seri }; diff -ruN linux-2.6.17-vanilla/drivers/sh/CVS/Entries linux-2.6.17/drivers/sh/CVS/Entries --- linux-2.6.17-vanilla/drivers/sh/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/sh/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/sh/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,2 @@ +/Makefile/1.3/Thu Nov 10 14:20:52 2005/-ko/ +D/superhyway//// diff -ruN linux-2.6.17-vanilla/drivers/sh/CVS/Repository linux-2.6.17/drivers/sh/CVS/Repository --- linux-2.6.17-vanilla/drivers/sh/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/sh/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/sh/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/drivers/sh diff -ruN linux-2.6.17-vanilla/drivers/sh/CVS/Root linux-2.6.17/drivers/sh/CVS/Root --- linux-2.6.17-vanilla/drivers/sh/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/sh/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/sh/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/drivers/sh/Makefile linux-2.6.17/drivers/sh/Makefile --- linux-2.6.17-vanilla/drivers/sh/Makefile 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/sh/Makefile 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/sh/Makefile 2006-07-07 10:17:07.000000000 +0000 @@ -2,5 +2,5 @@ # Makefile for the SuperH specific drivers. # @@ -44693,7 +44886,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/sh/Makefile linux-2.6.17/drivers/sh/Makef diff -ruN linux-2.6.17-vanilla/drivers/sh/superhyway/CVS/Entries linux-2.6.17/drivers/sh/superhyway/CVS/Entries --- linux-2.6.17-vanilla/drivers/sh/superhyway/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/sh/superhyway/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/sh/superhyway/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,4 @@ +/Makefile/1.1/Fri Mar 4 18:56:52 2005/-ko/ +/superhyway-sysfs.c/1.3/Mon Aug 29 21:01:19 2005/-ko/ @@ -44701,33 +44894,33 @@ diff -ruN linux-2.6.17-vanilla/drivers/sh/superhyway/CVS/Entries linux-2.6.17/dr +D diff -ruN linux-2.6.17-vanilla/drivers/sh/superhyway/CVS/Repository linux-2.6.17/drivers/sh/superhyway/CVS/Repository --- linux-2.6.17-vanilla/drivers/sh/superhyway/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/sh/superhyway/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/sh/superhyway/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/drivers/sh/superhyway diff -ruN linux-2.6.17-vanilla/drivers/sh/superhyway/CVS/Root linux-2.6.17/drivers/sh/superhyway/CVS/Root --- linux-2.6.17-vanilla/drivers/sh/superhyway/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/sh/superhyway/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/sh/superhyway/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/drivers/usb/CVS/Entries linux-2.6.17/drivers/usb/CVS/Entries --- linux-2.6.17-vanilla/drivers/usb/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/usb/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/usb/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,2 @@ +D/host//// +/Kconfig/1.3/Wed Jul 5 14:51:25 2006/-ko/ diff -ruN linux-2.6.17-vanilla/drivers/usb/CVS/Repository linux-2.6.17/drivers/usb/CVS/Repository --- linux-2.6.17-vanilla/drivers/usb/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/usb/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/usb/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/drivers/usb diff -ruN linux-2.6.17-vanilla/drivers/usb/CVS/Root linux-2.6.17/drivers/usb/CVS/Root --- linux-2.6.17-vanilla/drivers/usb/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/usb/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/usb/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/drivers/usb/Kconfig linux-2.6.17/drivers/usb/Kconfig --- linux-2.6.17-vanilla/drivers/usb/Kconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/usb/Kconfig 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/usb/Kconfig 2006-07-07 10:17:07.000000000 +0000 @@ -29,6 +29,8 @@ default y if PPC_MPC52xx # MIPS: @@ -44739,7 +44932,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/usb/Kconfig linux-2.6.17/drivers/usb/Kcon diff -ruN linux-2.6.17-vanilla/drivers/usb/host/CVS/Entries linux-2.6.17/drivers/usb/host/CVS/Entries --- linux-2.6.17-vanilla/drivers/usb/host/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/usb/host/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/usb/host/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,4 @@ +/ohci-voyagergx.c/1.4/Fri Jan 27 16:11:52 2006/-ko/ +/Kconfig/1.12/Wed Jul 5 14:51:27 2006/-ko/ @@ -44747,17 +44940,17 @@ diff -ruN linux-2.6.17-vanilla/drivers/usb/host/CVS/Entries linux-2.6.17/drivers +D diff -ruN linux-2.6.17-vanilla/drivers/usb/host/CVS/Repository linux-2.6.17/drivers/usb/host/CVS/Repository --- linux-2.6.17-vanilla/drivers/usb/host/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/usb/host/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/usb/host/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/drivers/usb/host diff -ruN linux-2.6.17-vanilla/drivers/usb/host/CVS/Root linux-2.6.17/drivers/usb/host/CVS/Root --- linux-2.6.17-vanilla/drivers/usb/host/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/usb/host/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/usb/host/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/drivers/usb/host/Kconfig linux-2.6.17/drivers/usb/host/Kconfig --- linux-2.6.17-vanilla/drivers/usb/host/Kconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/usb/host/Kconfig 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/usb/host/Kconfig 2006-07-07 10:17:07.000000000 +0000 @@ -148,3 +148,13 @@ To compile this driver as a module, choose M here: the module will be called "sl811_cs". @@ -44774,7 +44967,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/usb/host/Kconfig linux-2.6.17/drivers/usb + module will be called SM501. diff -ruN linux-2.6.17-vanilla/drivers/usb/host/ohci-hcd.c linux-2.6.17/drivers/usb/host/ohci-hcd.c --- linux-2.6.17-vanilla/drivers/usb/host/ohci-hcd.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/usb/host/ohci-hcd.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/usb/host/ohci-hcd.c 2006-07-07 10:17:07.000000000 +0000 @@ -878,7 +878,9 @@ MODULE_DESCRIPTION (DRIVER_INFO); MODULE_LICENSE ("GPL"); @@ -44796,7 +44989,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/usb/host/ohci-hcd.c linux-2.6.17/drivers/ #endif diff -ruN linux-2.6.17-vanilla/drivers/usb/host/ohci-voyagergx.c linux-2.6.17/drivers/usb/host/ohci-voyagergx.c --- linux-2.6.17-vanilla/drivers/usb/host/ohci-voyagergx.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/usb/host/ohci-voyagergx.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/usb/host/ohci-voyagergx.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,259 @@ +/* + * SM501 USB HCD for Linux Version. @@ -45059,7 +45252,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/usb/host/ohci-voyagergx.c linux-2.6.17/dr +module_exit(voyagergx_ohci_exit); diff -ruN linux-2.6.17-vanilla/drivers/video/CVS/Entries linux-2.6.17/drivers/video/CVS/Entries --- linux-2.6.17-vanilla/drivers/video/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/video/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/video/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,7 @@ +/hitfb.c/1.22/Sun Jan 29 17:46:24 2006/-ko/ +/pvr2fb.c/1.27/Sun Jan 8 13:56:39 2006// @@ -45070,17 +45263,17 @@ diff -ruN linux-2.6.17-vanilla/drivers/video/CVS/Entries linux-2.6.17/drivers/vi +/Makefile/1.22/Wed Jul 5 14:51:28 2006/-ko/ diff -ruN linux-2.6.17-vanilla/drivers/video/CVS/Repository linux-2.6.17/drivers/video/CVS/Repository --- linux-2.6.17-vanilla/drivers/video/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/video/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/video/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/drivers/video diff -ruN linux-2.6.17-vanilla/drivers/video/CVS/Root linux-2.6.17/drivers/video/CVS/Root --- linux-2.6.17-vanilla/drivers/video/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/video/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/video/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/drivers/video/Kconfig linux-2.6.17/drivers/video/Kconfig --- linux-2.6.17-vanilla/drivers/video/Kconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/video/Kconfig 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/video/Kconfig 2006-07-07 10:17:07.000000000 +0000 @@ -151,6 +151,21 @@ help Support the Permedia2 FIFO disconnect feature (see CONFIG_FB_PM2). @@ -45105,7 +45298,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/video/Kconfig linux-2.6.17/drivers/video/ depends on FB && ARM && ARM_AMBA diff -ruN linux-2.6.17-vanilla/drivers/video/Makefile linux-2.6.17/drivers/video/Makefile --- linux-2.6.17-vanilla/drivers/video/Makefile 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/video/Makefile 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/video/Makefile 2006-07-07 10:17:07.000000000 +0000 @@ -38,6 +38,8 @@ obj-$(CONFIG_FB_KYRO) += kyro/ obj-$(CONFIG_FB_SAVAGE) += savage/ @@ -45117,24 +45310,24 @@ diff -ruN linux-2.6.17-vanilla/drivers/video/Makefile linux-2.6.17/drivers/video obj-$(CONFIG_FB_VIRGE) += virgefb.o diff -ruN linux-2.6.17-vanilla/drivers/video/backlight/CVS/Entries linux-2.6.17/drivers/video/backlight/CVS/Entries --- linux-2.6.17-vanilla/drivers/video/backlight/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/video/backlight/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/video/backlight/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,3 @@ +/Kconfig/1.2/Wed Jul 5 14:51:29 2006// +/hp680_bl.c/1.5/Wed Jul 5 14:51:29 2006// +D diff -ruN linux-2.6.17-vanilla/drivers/video/backlight/CVS/Repository linux-2.6.17/drivers/video/backlight/CVS/Repository --- linux-2.6.17-vanilla/drivers/video/backlight/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/video/backlight/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/video/backlight/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/drivers/video/backlight diff -ruN linux-2.6.17-vanilla/drivers/video/backlight/CVS/Root linux-2.6.17/drivers/video/backlight/CVS/Root --- linux-2.6.17-vanilla/drivers/video/backlight/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/video/backlight/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/video/backlight/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/drivers/video/backlight/Kconfig linux-2.6.17/drivers/video/backlight/Kconfig --- linux-2.6.17-vanilla/drivers/video/backlight/Kconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/video/backlight/Kconfig 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/video/backlight/Kconfig 2006-07-07 10:17:07.000000000 +0000 @@ -51,7 +51,7 @@ backlight driver. @@ -45146,7 +45339,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/video/backlight/Kconfig linux-2.6.17/driv help diff -ruN linux-2.6.17-vanilla/drivers/video/backlight/hp680_bl.c linux-2.6.17/drivers/video/backlight/hp680_bl.c --- linux-2.6.17-vanilla/drivers/video/backlight/hp680_bl.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/video/backlight/hp680_bl.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/video/backlight/hp680_bl.c 2006-07-07 10:17:07.000000000 +0000 @@ -1,7 +1,7 @@ /* * Backlight Driver for HP Jornada 680 @@ -45230,23 +45423,23 @@ diff -ruN linux-2.6.17-vanilla/drivers/video/backlight/hp680_bl.c linux-2.6.17/d MODULE_LICENSE("GPL"); diff -ruN linux-2.6.17-vanilla/drivers/video/console/CVS/Entries linux-2.6.17/drivers/video/console/CVS/Entries --- linux-2.6.17-vanilla/drivers/video/console/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/video/console/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/video/console/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,2 @@ +/Kconfig/1.7/Wed Jul 5 14:51:30 2006/-ko/ +D diff -ruN linux-2.6.17-vanilla/drivers/video/console/CVS/Repository linux-2.6.17/drivers/video/console/CVS/Repository --- linux-2.6.17-vanilla/drivers/video/console/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/video/console/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/video/console/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/drivers/video/console diff -ruN linux-2.6.17-vanilla/drivers/video/console/CVS/Root linux-2.6.17/drivers/video/console/CVS/Root --- linux-2.6.17-vanilla/drivers/video/console/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/video/console/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/video/console/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/drivers/video/console/Kconfig linux-2.6.17/drivers/video/console/Kconfig --- linux-2.6.17-vanilla/drivers/video/console/Kconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/video/console/Kconfig 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/video/console/Kconfig 2006-07-07 10:17:07.000000000 +0000 @@ -6,7 +6,7 @@ config VGA_CONSOLE @@ -45258,7 +45451,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/video/console/Kconfig linux-2.6.17/driver Saying Y here will allow you to use Linux in text mode through a diff -ruN linux-2.6.17-vanilla/drivers/video/hitfb.c linux-2.6.17/drivers/video/hitfb.c --- linux-2.6.17-vanilla/drivers/video/hitfb.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/video/hitfb.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/video/hitfb.c 2006-07-07 10:17:07.000000000 +0000 @@ -4,7 +4,7 @@ * (C) 1999 Mihai Spatar * (C) 2000 YAEGASHI Takeshi @@ -45642,7 +45835,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/video/hitfb.c linux-2.6.17/drivers/video/ module_init(hitfb_init); diff -ruN linux-2.6.17-vanilla/drivers/video/pvr2fb.c linux-2.6.17/drivers/video/pvr2fb.c --- linux-2.6.17-vanilla/drivers/video/pvr2fb.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/drivers/video/pvr2fb.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/video/pvr2fb.c 2006-07-07 10:17:07.000000000 +0000 @@ -189,7 +189,7 @@ static unsigned int is_blanked = 0; /* Is the screen blanked? */ @@ -45708,7 +45901,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/video/pvr2fb.c linux-2.6.17/drivers/video return 0; diff -ruN linux-2.6.17-vanilla/drivers/video/voyager/CVS/Entries linux-2.6.17/drivers/video/voyager/CVS/Entries --- linux-2.6.17-vanilla/drivers/video/voyager/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/video/voyager/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/video/voyager/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,9 @@ +/Makefile/1.2/Tue May 31 14:19:09 2005/-ko/ +/voyager_alphafb.c/1.2/Wed Feb 8 22:08:10 2006/-ko/ @@ -45721,17 +45914,17 @@ diff -ruN linux-2.6.17-vanilla/drivers/video/voyager/CVS/Entries linux-2.6.17/dr +D diff -ruN linux-2.6.17-vanilla/drivers/video/voyager/CVS/Repository linux-2.6.17/drivers/video/voyager/CVS/Repository --- linux-2.6.17-vanilla/drivers/video/voyager/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/video/voyager/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/video/voyager/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/drivers/video/voyager diff -ruN linux-2.6.17-vanilla/drivers/video/voyager/CVS/Root linux-2.6.17/drivers/video/voyager/CVS/Root --- linux-2.6.17-vanilla/drivers/video/voyager/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/video/voyager/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/video/voyager/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/drivers/video/voyager/Makefile linux-2.6.17/drivers/video/voyager/Makefile --- linux-2.6.17-vanilla/drivers/video/voyager/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/video/voyager/Makefile 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/video/voyager/Makefile 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,13 @@ +# +# Makefile for the VoyagerGX framebuffer driver @@ -45748,7 +45941,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/video/voyager/Makefile linux-2.6.17/drive + diff -ruN linux-2.6.17-vanilla/drivers/video/voyager/voyager_alphafb.c linux-2.6.17/drivers/video/voyager/voyager_alphafb.c --- linux-2.6.17-vanilla/drivers/video/voyager/voyager_alphafb.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/video/voyager/voyager_alphafb.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/video/voyager/voyager_alphafb.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,282 @@ +/* + * linux/drivers/video/voyager_alphafb.c -- voyager alpha frame buffer driver @@ -46034,7 +46227,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/video/voyager/voyager_alphafb.c linux-2.6 +MODULE_LICENSE("GPL"); diff -ruN linux-2.6.17-vanilla/drivers/video/voyager/voyager_crtcsrfb.c linux-2.6.17/drivers/video/voyager/voyager_crtcsrfb.c --- linux-2.6.17-vanilla/drivers/video/voyager/voyager_crtcsrfb.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/video/voyager/voyager_crtcsrfb.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/video/voyager/voyager_crtcsrfb.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,240 @@ +/* + * linux/drivers/video/voyager_crtcsrfb.c -- voyager crt HWC frame buffer driver @@ -46278,7 +46471,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/video/voyager/voyager_crtcsrfb.c linux-2. +MODULE_LICENSE("GPL"); diff -ruN linux-2.6.17-vanilla/drivers/video/voyager/voyager_crtfb.c linux-2.6.17/drivers/video/voyager/voyager_crtfb.c --- linux-2.6.17-vanilla/drivers/video/voyager/voyager_crtfb.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/video/voyager/voyager_crtfb.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/video/voyager/voyager_crtfb.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,240 @@ +/* + * linux/drivers/video/voyager_crtfb.c -- voyager crt frame buffer driver @@ -46522,7 +46715,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/video/voyager/voyager_crtfb.c linux-2.6.1 +MODULE_LICENSE("GPL"); diff -ruN linux-2.6.17-vanilla/drivers/video/voyager/voyager_gxfb.c linux-2.6.17/drivers/video/voyager/voyager_gxfb.c --- linux-2.6.17-vanilla/drivers/video/voyager/voyager_gxfb.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/video/voyager/voyager_gxfb.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/video/voyager/voyager_gxfb.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,441 @@ +/* + * linux/drivers/video/voyager_gxfb.c -- voyager panel frame buffer driver @@ -46967,7 +47160,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/video/voyager/voyager_gxfb.c linux-2.6.17 + diff -ruN linux-2.6.17-vanilla/drivers/video/voyager/voyager_panelcsrfb.c linux-2.6.17/drivers/video/voyager/voyager_panelcsrfb.c --- linux-2.6.17-vanilla/drivers/video/voyager/voyager_panelcsrfb.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/video/voyager/voyager_panelcsrfb.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/video/voyager/voyager_panelcsrfb.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,240 @@ +/* + * linux/drivers/video/voyager_panelcsrfb.c -- voyager panel HWC frame buffer driver @@ -47211,7 +47404,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/video/voyager/voyager_panelcsrfb.c linux- +MODULE_LICENSE("GPL"); diff -ruN linux-2.6.17-vanilla/drivers/video/voyager/voyager_valphafb.c linux-2.6.17/drivers/video/voyager/voyager_valphafb.c --- linux-2.6.17-vanilla/drivers/video/voyager/voyager_valphafb.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/video/voyager/voyager_valphafb.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/video/voyager/voyager_valphafb.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,286 @@ +/* + * linux/drivers/video/voyager_valphafb.c -- voyager video alpha frame buffer driver @@ -47501,7 +47694,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/video/voyager/voyager_valphafb.c linux-2. +MODULE_LICENSE("GPL"); diff -ruN linux-2.6.17-vanilla/drivers/video/voyager/voyager_videofb.c linux-2.6.17/drivers/video/voyager/voyager_videofb.c --- linux-2.6.17-vanilla/drivers/video/voyager/voyager_videofb.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/drivers/video/voyager/voyager_videofb.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/drivers/video/voyager/voyager_videofb.c 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,273 @@ +/* + * linux/drivers/video/voyager_videofb.c -- voyager video frame buffer driver @@ -47778,24 +47971,24 @@ diff -ruN linux-2.6.17-vanilla/drivers/video/voyager/voyager_videofb.c linux-2.6 +MODULE_LICENSE("GPL"); diff -ruN linux-2.6.17-vanilla/include/CVS/Entries linux-2.6.17/include/CVS/Entries --- linux-2.6.17-vanilla/include/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,3 @@ +D/asm-sh//// +D/linux//// +D/video//// diff -ruN linux-2.6.17-vanilla/include/CVS/Repository linux-2.6.17/include/CVS/Repository --- linux-2.6.17-vanilla/include/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/include diff -ruN linux-2.6.17-vanilla/include/CVS/Root linux-2.6.17/include/CVS/Root --- linux-2.6.17-vanilla/include/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/include/asm-sh/CVS/Entries linux-2.6.17/include/asm-sh/CVS/Entries --- linux-2.6.17-vanilla/include/asm-sh/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,113 @@ +/adc.h/1.2/Fri Sep 24 14:58:00 2004/-ko/ +/apm.h/1.1/Sun Jan 29 17:46:24 2006// @@ -47847,7 +48040,6 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/CVS/Entries linux-2.6.17/include/a +/pgtable.h/1.33/Sun Jan 22 17:26:20 2006// +/pm.h/1.1/Sun Jan 29 17:46:24 2006// +/posix_types.h/1.3/Thu Oct 9 14:59:21 2003// -+/processor.h/1.35/Sun Jan 15 12:11:50 2006/-ko/ +/ptrace.h/1.13/Mon Mar 27 21:06:15 2006// +/rtc.h/1.5/Fri Sep 24 14:58:00 2004/-ko/ +/rwsem.h/1.2/Tue Jan 3 22:35:58 2006/-ko/ @@ -47875,7 +48067,6 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/CVS/Entries linux-2.6.17/include/a +/titan.h/1.1/Tue Nov 29 04:01:49 2005// +/tlb.h/1.5/Tue May 6 23:28:51 2003// +/tlbflush.h/1.1/Fri Apr 12 04:26:29 2002// -+/uaccess.h/1.15/Fri Oct 28 13:12:50 2005/-ko/ +/ubc.h/1.4/Fri Sep 24 14:58:00 2004// +/user.h/1.5/Fri Sep 24 14:58:00 2004/-ko/ +/watchdog.h/1.4/Fri Sep 24 14:58:00 2004/-ko/ @@ -47907,22 +48098,24 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/CVS/Entries linux-2.6.17/include/a +/kexec.h/1.2/Wed Jul 5 14:51:36 2006/-ko/ +/page.h/1.15/Wed Jul 5 14:51:36 2006// +/poll.h/1.3/Wed Jul 5 14:51:37 2006// -+/thread_info.h/1.17/Wed Jul 5 14:51:37 2006/-ko/ +/types.h/1.7/Wed Jul 5 14:51:37 2006/-ko/ -+/unistd.h/1.28/Wed Jul 5 14:51:37 2006/-ko/ ++/processor.h/1.36/Fri Jul 7 10:15:20 2006/-ko/ ++/thread_info.h/1.18/Fri Jul 7 10:15:20 2006/-ko/ ++/uaccess.h/1.17/Fri Jul 7 10:15:20 2006/-ko/ ++/unistd.h/1.29/Fri Jul 7 10:15:20 2006/-ko/ diff -ruN linux-2.6.17-vanilla/include/asm-sh/CVS/Repository linux-2.6.17/include/asm-sh/CVS/Repository --- linux-2.6.17-vanilla/include/asm-sh/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/include/asm-sh diff -ruN linux-2.6.17-vanilla/include/asm-sh/CVS/Root linux-2.6.17/include/asm-sh/CVS/Root --- linux-2.6.17-vanilla/include/asm-sh/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/include/asm-sh/apm.h linux-2.6.17/include/asm-sh/apm.h --- linux-2.6.17-vanilla/include/asm-sh/apm.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/apm.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/apm.h 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,46 @@ +/* + * Copyright 2006 (c) Andriy Skulysh <askulysh@gmail.com> @@ -47972,7 +48165,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/apm.h linux-2.6.17/include/asm-sh/ +#endif diff -ruN linux-2.6.17-vanilla/include/asm-sh/atomic.h linux-2.6.17/include/asm-sh/atomic.h --- linux-2.6.17-vanilla/include/asm-sh/atomic.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/atomic.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/atomic.h 2006-07-07 10:17:07.000000000 +0000 @@ -14,6 +14,7 @@ #define atomic_read(v) ((v)->counter) #define atomic_set(v,i) ((v)->counter = (i)) @@ -47983,7 +48176,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/atomic.h linux-2.6.17/include/asm- /* diff -ruN linux-2.6.17-vanilla/include/asm-sh/bigsur/CVS/Entries linux-2.6.17/include/asm-sh/bigsur/CVS/Entries --- linux-2.6.17-vanilla/include/asm-sh/bigsur/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/bigsur/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/bigsur/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,4 @@ +/bigsur.h/1.2/Fri Nov 1 17:19:28 2002// +/io.h/1.4/Mon Aug 4 01:38:06 2003// @@ -47991,17 +48184,17 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/bigsur/CVS/Entries linux-2.6.17/in +D diff -ruN linux-2.6.17-vanilla/include/asm-sh/bigsur/CVS/Repository linux-2.6.17/include/asm-sh/bigsur/CVS/Repository --- linux-2.6.17-vanilla/include/asm-sh/bigsur/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/bigsur/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/bigsur/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/include/asm-sh/bigsur diff -ruN linux-2.6.17-vanilla/include/asm-sh/bigsur/CVS/Root linux-2.6.17/include/asm-sh/bigsur/CVS/Root --- linux-2.6.17-vanilla/include/asm-sh/bigsur/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/bigsur/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/bigsur/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/include/asm-sh/bitops.h linux-2.6.17/include/asm-sh/bitops.h --- linux-2.6.17-vanilla/include/asm-sh/bitops.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/bitops.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/bitops.h 2006-07-07 10:17:07.000000000 +0000 @@ -6,7 +6,7 @@ /* For __swab32 */ #include <asm/byteorder.h> @@ -48076,7 +48269,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/bitops.h linux-2.6.17/include/asm- diff -ruN linux-2.6.17-vanilla/include/asm-sh/bugs.h linux-2.6.17/include/asm-sh/bugs.h --- linux-2.6.17-vanilla/include/asm-sh/bugs.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/bugs.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/bugs.h 2006-07-07 10:17:07.000000000 +0000 @@ -32,6 +32,10 @@ case CPU_SH7750 ... CPU_SH4_501: *p++ = '4'; @@ -48090,7 +48283,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/bugs.h linux-2.6.17/include/asm-sh *p++ = '!'; diff -ruN linux-2.6.17-vanilla/include/asm-sh/cache.h linux-2.6.17/include/asm-sh/cache.h --- linux-2.6.17-vanilla/include/asm-sh/cache.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/cache.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/cache.h 2006-07-07 10:17:07.000000000 +0000 @@ -10,7 +10,6 @@ #ifdef __KERNEL__ @@ -48145,7 +48338,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/cache.h linux-2.6.17/include/asm-s #endif /* __ASM_SH_CACHE_H */ diff -ruN linux-2.6.17-vanilla/include/asm-sh/cacheflush.h linux-2.6.17/include/asm-sh/cacheflush.h --- linux-2.6.17-vanilla/include/asm-sh/cacheflush.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/cacheflush.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/cacheflush.h 2006-07-07 10:17:07.000000000 +0000 @@ -2,6 +2,7 @@ #define __ASM_SH_CACHEFLUSH_H #ifdef __KERNEL__ @@ -48156,23 +48349,23 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/cacheflush.h linux-2.6.17/include/ /* Flush (write-back only) a region (smaller than a page) */ diff -ruN linux-2.6.17-vanilla/include/asm-sh/cat68701/CVS/Entries linux-2.6.17/include/asm-sh/cat68701/CVS/Entries --- linux-2.6.17-vanilla/include/asm-sh/cat68701/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/cat68701/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/cat68701/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,2 @@ +/io.h/1.4/Mon Aug 4 01:44:40 2003// +D diff -ruN linux-2.6.17-vanilla/include/asm-sh/cat68701/CVS/Repository linux-2.6.17/include/asm-sh/cat68701/CVS/Repository --- linux-2.6.17-vanilla/include/asm-sh/cat68701/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/cat68701/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/cat68701/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/include/asm-sh/cat68701 diff -ruN linux-2.6.17-vanilla/include/asm-sh/cat68701/CVS/Root linux-2.6.17/include/asm-sh/cat68701/CVS/Root --- linux-2.6.17-vanilla/include/asm-sh/cat68701/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/cat68701/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/cat68701/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/include/asm-sh/checksum.h linux-2.6.17/include/asm-sh/checksum.h --- linux-2.6.17-vanilla/include/asm-sh/checksum.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/checksum.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/checksum.h 2006-07-07 10:17:07.000000000 +0000 @@ -160,6 +160,7 @@ } @@ -48191,7 +48384,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/checksum.h linux-2.6.17/include/as * Copy and checksum to user diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh2/CVS/Entries linux-2.6.17/include/asm-sh/cpu-sh2/CVS/Entries --- linux-2.6.17-vanilla/include/asm-sh/cpu-sh2/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/cpu-sh2/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/cpu-sh2/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,8 @@ +/addrspace.h/1.1/Fri Jul 4 13:01:46 2003// +/cache.h/1.3/Wed Jul 16 04:08:29 2003/-ko/ @@ -48203,17 +48396,17 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh2/CVS/Entries linux-2.6.17/i +D diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh2/CVS/Repository linux-2.6.17/include/asm-sh/cpu-sh2/CVS/Repository --- linux-2.6.17-vanilla/include/asm-sh/cpu-sh2/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/cpu-sh2/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/cpu-sh2/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/include/asm-sh/cpu-sh2 diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh2/CVS/Root linux-2.6.17/include/asm-sh/cpu-sh2/CVS/Root --- linux-2.6.17-vanilla/include/asm-sh/cpu-sh2/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/cpu-sh2/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/cpu-sh2/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh3/CVS/Entries linux-2.6.17/include/asm-sh/cpu-sh3/CVS/Entries --- linux-2.6.17-vanilla/include/asm-sh/cpu-sh3/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/cpu-sh3/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/cpu-sh3/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,14 @@ +/adc.h/1.2/Sun Aug 15 16:59:32 2004/-ko/ +/addrspace.h/1.2/Sun May 4 19:30:07 2003/-ko/ @@ -48231,17 +48424,17 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh3/CVS/Entries linux-2.6.17/i +D diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh3/CVS/Repository linux-2.6.17/include/asm-sh/cpu-sh3/CVS/Repository --- linux-2.6.17-vanilla/include/asm-sh/cpu-sh3/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/cpu-sh3/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/cpu-sh3/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/include/asm-sh/cpu-sh3 diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh3/CVS/Root linux-2.6.17/include/asm-sh/cpu-sh3/CVS/Root --- linux-2.6.17-vanilla/include/asm-sh/cpu-sh3/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/cpu-sh3/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/cpu-sh3/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh3/cache.h linux-2.6.17/include/asm-sh/cpu-sh3/cache.h --- linux-2.6.17-vanilla/include/asm-sh/cpu-sh3/cache.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/cpu-sh3/cache.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/cpu-sh3/cache.h 2006-07-07 10:17:07.000000000 +0000 @@ -26,7 +26,7 @@ #define CCR_CACHE_ENABLE CCR_CACHE_CE #define CCR_CACHE_INVALIDATE CCR_CACHE_CF @@ -48253,7 +48446,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh3/cache.h linux-2.6.17/inclu #define CCR_CACHE_32KB 0x00020000 diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh3/cacheflush.h linux-2.6.17/include/asm-sh/cpu-sh3/cacheflush.h --- linux-2.6.17-vanilla/include/asm-sh/cpu-sh3/cacheflush.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/cpu-sh3/cacheflush.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/cpu-sh3/cacheflush.h 2006-07-07 10:17:07.000000000 +0000 @@ -10,7 +10,7 @@ #ifndef __ASM_CPU_SH3_CACHEFLUSH_H #define __ASM_CPU_SH3_CACHEFLUSH_H @@ -48339,7 +48532,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh3/cacheflush.h linux-2.6.17/ diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh3/freq.h linux-2.6.17/include/asm-sh/cpu-sh3/freq.h --- linux-2.6.17-vanilla/include/asm-sh/cpu-sh3/freq.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/cpu-sh3/freq.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/cpu-sh3/freq.h 2006-07-07 10:17:07.000000000 +0000 @@ -18,5 +18,9 @@ #define MIN_DIVISOR_NR 0 #define MAX_DIVISOR_NR 4 @@ -48352,7 +48545,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh3/freq.h linux-2.6.17/includ diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh3/timer.h linux-2.6.17/include/asm-sh/cpu-sh3/timer.h --- linux-2.6.17-vanilla/include/asm-sh/cpu-sh3/timer.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/cpu-sh3/timer.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/cpu-sh3/timer.h 2006-07-07 10:17:07.000000000 +0000 @@ -23,6 +23,10 @@ * --------------------------------------------------------------------------- */ @@ -48376,7 +48569,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh3/timer.h linux-2.6.17/inclu #define TMU0_TCOR 0xfffffe94 /* Long access */ diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh4/CVS/Entries linux-2.6.17/include/asm-sh/cpu-sh4/CVS/Entries --- linux-2.6.17-vanilla/include/asm-sh/cpu-sh4/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/cpu-sh4/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/cpu-sh4/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,14 @@ +/addrspace.h/1.3/Wed Jan 18 05:43:01 2006/-ko/ +/cache.h/1.5/Sun Aug 21 23:47:31 2005/-ko/ @@ -48394,17 +48587,17 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh4/CVS/Entries linux-2.6.17/i +D diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh4/CVS/Repository linux-2.6.17/include/asm-sh/cpu-sh4/CVS/Repository --- linux-2.6.17-vanilla/include/asm-sh/cpu-sh4/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/cpu-sh4/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/cpu-sh4/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/include/asm-sh/cpu-sh4 diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh4/CVS/Root linux-2.6.17/include/asm-sh/cpu-sh4/CVS/Root --- linux-2.6.17-vanilla/include/asm-sh/cpu-sh4/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/cpu-sh4/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/cpu-sh4/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh4/addrspace.h linux-2.6.17/include/asm-sh/cpu-sh4/addrspace.h --- linux-2.6.17-vanilla/include/asm-sh/cpu-sh4/addrspace.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/cpu-sh4/addrspace.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/cpu-sh4/addrspace.h 2006-07-07 10:17:07.000000000 +0000 @@ -22,5 +22,8 @@ #define P4SEG_TLB_DATA 0xf7000000 #define P4SEG_REG_BASE 0xff000000 @@ -48416,7 +48609,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh4/addrspace.h linux-2.6.17/i diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh4/cache.h linux-2.6.17/include/asm-sh/cpu-sh4/cache.h --- linux-2.6.17-vanilla/include/asm-sh/cpu-sh4/cache.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/cpu-sh4/cache.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/cpu-sh4/cache.h 2006-07-07 10:17:07.000000000 +0000 @@ -22,7 +22,9 @@ #define CCR_CACHE_ICE 0x0100 /* Instruction Cache Enable */ #define CCR_CACHE_ICI 0x0800 /* IC Invalidate */ @@ -48429,7 +48622,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh4/cache.h linux-2.6.17/inclu #define CCR_CACHE_ENABLE (CCR_CACHE_OCE|CCR_CACHE_ICE) diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh4/cacheflush.h linux-2.6.17/include/asm-sh/cpu-sh4/cacheflush.h --- linux-2.6.17-vanilla/include/asm-sh/cpu-sh4/cacheflush.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/cpu-sh4/cacheflush.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/cpu-sh4/cacheflush.h 2006-07-07 10:17:07.000000000 +0000 @@ -16,34 +16,26 @@ * caching; in which case they're only semi-broken), * so we need them. @@ -48484,7 +48677,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh4/cacheflush.h linux-2.6.17/ - diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh4/dma-sh7780.h linux-2.6.17/include/asm-sh/cpu-sh4/dma-sh7780.h --- linux-2.6.17-vanilla/include/asm-sh/cpu-sh4/dma-sh7780.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/cpu-sh4/dma-sh7780.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/cpu-sh4/dma-sh7780.h 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,39 @@ +#ifndef __ASM_SH_CPU_SH4_DMA_SH7780_H +#define __ASM_SH_CPU_SH4_DMA_SH7780_H @@ -48527,7 +48720,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh4/dma-sh7780.h linux-2.6.17/ +#endif /* __ASM_SH_CPU_SH4_DMA_SH7780_H */ diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh4/dma.h linux-2.6.17/include/asm-sh/cpu-sh4/dma.h --- linux-2.6.17-vanilla/include/asm-sh/cpu-sh4/dma.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/cpu-sh4/dma.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/cpu-sh4/dma.h 2006-07-07 10:17:07.000000000 +0000 @@ -1,11 +1,17 @@ #ifndef __ASM_CPU_SH4_DMA_H #define __ASM_CPU_SH4_DMA_H @@ -48565,7 +48758,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh4/dma.h linux-2.6.17/include #endif /* __ASM_CPU_SH4_DMA_H */ diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh4/sq.h linux-2.6.17/include/asm-sh/cpu-sh4/sq.h --- linux-2.6.17-vanilla/include/asm-sh/cpu-sh4/sq.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/cpu-sh4/sq.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/cpu-sh4/sq.h 2006-07-07 10:17:07.000000000 +0000 @@ -17,7 +17,7 @@ * Store queues range from e0000000-e3fffffc, allowing approx. 64MB to be * mapped to any physical address space. Since data is written (and aligned) @@ -48605,39 +48798,39 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/cpu-sh4/sq.h linux-2.6.17/include/ - diff -ruN linux-2.6.17-vanilla/include/asm-sh/cqreek/CVS/Entries linux-2.6.17/include/asm-sh/cqreek/CVS/Entries --- linux-2.6.17-vanilla/include/asm-sh/cqreek/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/cqreek/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/cqreek/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,2 @@ +/cqreek.h/1.2/Fri Nov 1 17:19:28 2002// +D diff -ruN linux-2.6.17-vanilla/include/asm-sh/cqreek/CVS/Repository linux-2.6.17/include/asm-sh/cqreek/CVS/Repository --- linux-2.6.17-vanilla/include/asm-sh/cqreek/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/cqreek/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/cqreek/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/include/asm-sh/cqreek diff -ruN linux-2.6.17-vanilla/include/asm-sh/cqreek/CVS/Root linux-2.6.17/include/asm-sh/cqreek/CVS/Root --- linux-2.6.17-vanilla/include/asm-sh/cqreek/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/cqreek/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/cqreek/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/include/asm-sh/dmida/CVS/Entries linux-2.6.17/include/asm-sh/dmida/CVS/Entries --- linux-2.6.17-vanilla/include/asm-sh/dmida/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/dmida/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/dmida/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,2 @@ +/io.h/1.2/Sun May 4 19:30:13 2003/-ko/ +D diff -ruN linux-2.6.17-vanilla/include/asm-sh/dmida/CVS/Repository linux-2.6.17/include/asm-sh/dmida/CVS/Repository --- linux-2.6.17-vanilla/include/asm-sh/dmida/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/dmida/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/dmida/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/include/asm-sh/dmida diff -ruN linux-2.6.17-vanilla/include/asm-sh/dmida/CVS/Root linux-2.6.17/include/asm-sh/dmida/CVS/Root --- linux-2.6.17-vanilla/include/asm-sh/dmida/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/dmida/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/dmida/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/include/asm-sh/dreamcast/CVS/Entries linux-2.6.17/include/asm-sh/dreamcast/CVS/Entries --- linux-2.6.17-vanilla/include/asm-sh/dreamcast/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/dreamcast/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/dreamcast/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,4 @@ +/dma.h/1.2/Wed Aug 27 12:35:06 2003// +/pci.h/1.1/Sun Aug 17 16:27:11 2003// @@ -48645,17 +48838,17 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/dreamcast/CVS/Entries linux-2.6.17 +D diff -ruN linux-2.6.17-vanilla/include/asm-sh/dreamcast/CVS/Repository linux-2.6.17/include/asm-sh/dreamcast/CVS/Repository --- linux-2.6.17-vanilla/include/asm-sh/dreamcast/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/dreamcast/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/dreamcast/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/include/asm-sh/dreamcast diff -ruN linux-2.6.17-vanilla/include/asm-sh/dreamcast/CVS/Root linux-2.6.17/include/asm-sh/dreamcast/CVS/Root --- linux-2.6.17-vanilla/include/asm-sh/dreamcast/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/dreamcast/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/dreamcast/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/include/asm-sh/ec3104/CVS/Entries linux-2.6.17/include/asm-sh/ec3104/CVS/Entries --- linux-2.6.17-vanilla/include/asm-sh/ec3104/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/ec3104/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/ec3104/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,5 @@ +/ec3104.h/1.2/Fri Nov 1 17:19:29 2002// +/io.h/1.3/Tue Jul 29 14:27:12 2003// @@ -48664,50 +48857,50 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/ec3104/CVS/Entries linux-2.6.17/in +D diff -ruN linux-2.6.17-vanilla/include/asm-sh/ec3104/CVS/Repository linux-2.6.17/include/asm-sh/ec3104/CVS/Repository --- linux-2.6.17-vanilla/include/asm-sh/ec3104/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/ec3104/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/ec3104/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/include/asm-sh/ec3104 diff -ruN linux-2.6.17-vanilla/include/asm-sh/ec3104/CVS/Root linux-2.6.17/include/asm-sh/ec3104/CVS/Root --- linux-2.6.17-vanilla/include/asm-sh/ec3104/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/ec3104/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/ec3104/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/include/asm-sh/edosk7705/CVS/Entries linux-2.6.17/include/asm-sh/edosk7705/CVS/Entries --- linux-2.6.17-vanilla/include/asm-sh/edosk7705/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/edosk7705/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/edosk7705/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,2 @@ +/io.h/1.1/Mon Aug 30 12:55:33 2004/-ko/ +D diff -ruN linux-2.6.17-vanilla/include/asm-sh/edosk7705/CVS/Repository linux-2.6.17/include/asm-sh/edosk7705/CVS/Repository --- linux-2.6.17-vanilla/include/asm-sh/edosk7705/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/edosk7705/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/edosk7705/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/include/asm-sh/edosk7705 diff -ruN linux-2.6.17-vanilla/include/asm-sh/edosk7705/CVS/Root linux-2.6.17/include/asm-sh/edosk7705/CVS/Root --- linux-2.6.17-vanilla/include/asm-sh/edosk7705/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/edosk7705/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/edosk7705/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/include/asm-sh/harp/CVS/Entries linux-2.6.17/include/asm-sh/harp/CVS/Entries --- linux-2.6.17-vanilla/include/asm-sh/harp/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/harp/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/harp/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,3 @@ +/harp.h/1.2/Fri Nov 1 17:19:29 2002// +/io.h/1.2/Sun May 4 19:30:14 2003/-ko/ +D diff -ruN linux-2.6.17-vanilla/include/asm-sh/harp/CVS/Repository linux-2.6.17/include/asm-sh/harp/CVS/Repository --- linux-2.6.17-vanilla/include/asm-sh/harp/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/harp/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/harp/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/include/asm-sh/harp diff -ruN linux-2.6.17-vanilla/include/asm-sh/harp/CVS/Root linux-2.6.17/include/asm-sh/harp/CVS/Root --- linux-2.6.17-vanilla/include/asm-sh/harp/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/harp/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/harp/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/include/asm-sh/hd64461.h linux-2.6.17/include/asm-sh/hd64461.h --- linux-2.6.17-vanilla/include/asm-sh/hd64461.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/hd64461.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/hd64461.h 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,208 @@ +#ifndef __ASM_SH_HD64461 +#define __ASM_SH_HD64461 @@ -48919,7 +49112,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/hd64461.h linux-2.6.17/include/asm +#endif diff -ruN linux-2.6.17-vanilla/include/asm-sh/hd64465/CVS/Entries linux-2.6.17/include/asm-sh/hd64465/CVS/Entries --- linux-2.6.17-vanilla/include/asm-sh/hd64465/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/hd64465/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/hd64465/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,4 @@ +/gpio.h/1.3/Sun May 4 19:30:14 2003// +/hd64465.h/1.3/Sun May 4 19:30:15 2003// @@ -48927,17 +49120,17 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/hd64465/CVS/Entries linux-2.6.17/i +D diff -ruN linux-2.6.17-vanilla/include/asm-sh/hd64465/CVS/Repository linux-2.6.17/include/asm-sh/hd64465/CVS/Repository --- linux-2.6.17-vanilla/include/asm-sh/hd64465/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/hd64465/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/hd64465/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/include/asm-sh/hd64465 diff -ruN linux-2.6.17-vanilla/include/asm-sh/hd64465/CVS/Root linux-2.6.17/include/asm-sh/hd64465/CVS/Root --- linux-2.6.17-vanilla/include/asm-sh/hd64465/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/hd64465/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/hd64465/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/include/asm-sh/hp6xx/CVS/Entries linux-2.6.17/include/asm-sh/hp6xx/CVS/Entries --- linux-2.6.17-vanilla/include/asm-sh/hp6xx/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/hp6xx/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/hp6xx/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,4 @@ +/hp6xx.h/1.3/Sun Jan 29 17:46:24 2006/-ko/ +/ide.h/1.2/Sat Jun 5 17:17:34 2004/-ko/ @@ -48945,17 +49138,17 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/hp6xx/CVS/Entries linux-2.6.17/inc +D diff -ruN linux-2.6.17-vanilla/include/asm-sh/hp6xx/CVS/Repository linux-2.6.17/include/asm-sh/hp6xx/CVS/Repository --- linux-2.6.17-vanilla/include/asm-sh/hp6xx/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/hp6xx/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/hp6xx/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/include/asm-sh/hp6xx diff -ruN linux-2.6.17-vanilla/include/asm-sh/hp6xx/CVS/Root linux-2.6.17/include/asm-sh/hp6xx/CVS/Root --- linux-2.6.17-vanilla/include/asm-sh/hp6xx/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/hp6xx/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/hp6xx/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/include/asm-sh/hp6xx/hp6xx.h linux-2.6.17/include/asm-sh/hp6xx/hp6xx.h --- linux-2.6.17-vanilla/include/asm-sh/hp6xx/hp6xx.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/hp6xx/hp6xx.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/hp6xx/hp6xx.h 2006-07-07 10:17:07.000000000 +0000 @@ -2,16 +2,33 @@ #define __ASM_SH_HP6XX_H @@ -49038,7 +49231,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/hp6xx/hp6xx.h linux-2.6.17/include #endif /* __ASM_SH_HP6XX_H */ diff -ruN linux-2.6.17-vanilla/include/asm-sh/hp6xx/io.h linux-2.6.17/include/asm-sh/hp6xx/io.h --- linux-2.6.17-vanilla/include/asm-sh/hp6xx/io.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/hp6xx/io.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/hp6xx/io.h 2006-07-07 10:17:07.000000000 +0000 @@ -4,7 +4,7 @@ /* * Nothing special here.. just use the generic cchip io routines. @@ -49050,24 +49243,24 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/hp6xx/io.h linux-2.6.17/include/as diff -ruN linux-2.6.17-vanilla/include/asm-sh/hs7751rvoip/CVS/Entries linux-2.6.17/include/asm-sh/hs7751rvoip/CVS/Entries --- linux-2.6.17-vanilla/include/asm-sh/hs7751rvoip/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/hs7751rvoip/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/hs7751rvoip/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,3 @@ +/hs7751rvoip.h/1.4/Wed Jan 18 05:43:01 2006/-ko/ +/ide.h/1.1/Wed Apr 21 00:09:19 2004/-ko/ +D diff -ruN linux-2.6.17-vanilla/include/asm-sh/hs7751rvoip/CVS/Repository linux-2.6.17/include/asm-sh/hs7751rvoip/CVS/Repository --- linux-2.6.17-vanilla/include/asm-sh/hs7751rvoip/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/hs7751rvoip/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/hs7751rvoip/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/include/asm-sh/hs7751rvoip diff -ruN linux-2.6.17-vanilla/include/asm-sh/hs7751rvoip/CVS/Root linux-2.6.17/include/asm-sh/hs7751rvoip/CVS/Root --- linux-2.6.17-vanilla/include/asm-sh/hs7751rvoip/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/hs7751rvoip/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/hs7751rvoip/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/include/asm-sh/hs7751rvoip/hs7751rvoip.h linux-2.6.17/include/asm-sh/hs7751rvoip/hs7751rvoip.h --- linux-2.6.17-vanilla/include/asm-sh/hs7751rvoip/hs7751rvoip.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/hs7751rvoip/hs7751rvoip.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/hs7751rvoip/hs7751rvoip.h 2006-07-07 10:17:07.000000000 +0000 @@ -19,8 +19,6 @@ #define PA_OUTPORTR 0xa400000e /* Output Port Reguster */ #define PA_VERREG 0xa4000014 /* FPGA Version Register */ @@ -49093,7 +49286,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/hs7751rvoip/hs7751rvoip.h linux-2. #endif /* __ASM_SH_RENESAS_HS7751RVOIP */ diff -ruN linux-2.6.17-vanilla/include/asm-sh/io.h linux-2.6.17/include/asm-sh/io.h --- linux-2.6.17-vanilla/include/asm-sh/io.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/io.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/io.h 2006-07-07 10:17:07.000000000 +0000 @@ -210,6 +210,11 @@ *(volatile unsigned long*)addr = b; } @@ -49108,7 +49301,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/io.h linux-2.6.17/include/asm-sh/i /* diff -ruN linux-2.6.17-vanilla/include/asm-sh/irq-sh73180.h linux-2.6.17/include/asm-sh/irq-sh73180.h --- linux-2.6.17-vanilla/include/asm-sh/irq-sh73180.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/irq-sh73180.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/irq-sh73180.h 2006-07-07 10:17:07.000000000 +0000 @@ -12,14 +12,14 @@ #undef INTC_IPRC #undef INTC_IPRD @@ -49143,7 +49336,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/irq-sh73180.h linux-2.6.17/include #define FLCTL_PRIORITY 3 diff -ruN linux-2.6.17-vanilla/include/asm-sh/irq.h linux-2.6.17/include/asm-sh/irq.h --- linux-2.6.17-vanilla/include/asm-sh/irq.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/irq.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/irq.h 2006-07-07 10:17:07.000000000 +0000 @@ -336,6 +336,11 @@ extern unsigned short *irq_mask_register; @@ -49158,7 +49351,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/irq.h linux-2.6.17/include/asm-sh/ extern void make_ipr_irq(unsigned int irq, unsigned int addr, diff -ruN linux-2.6.17-vanilla/include/asm-sh/kexec.h linux-2.6.17/include/asm-sh/kexec.h --- linux-2.6.17-vanilla/include/asm-sh/kexec.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/kexec.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/kexec.h 2006-07-07 10:17:07.000000000 +0000 @@ -23,6 +23,8 @@ /* The native architecture */ #define KEXEC_ARCH KEXEC_ARCH_SH @@ -49170,7 +49363,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/kexec.h linux-2.6.17/include/asm-s extern void machine_shutdown(void); diff -ruN linux-2.6.17-vanilla/include/asm-sh/kgdb.h linux-2.6.17/include/asm-sh/kgdb.h --- linux-2.6.17-vanilla/include/asm-sh/kgdb.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/kgdb.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/kgdb.h 2006-07-07 10:17:07.000000000 +0000 @@ -128,4 +128,19 @@ #define KGDB_ASSERT(condition, message) #endif @@ -49193,7 +49386,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/kgdb.h linux-2.6.17/include/asm-sh #endif diff -ruN linux-2.6.17-vanilla/include/asm-sh/landisk/CVS/Entries linux-2.6.17/include/asm-sh/landisk/CVS/Entries --- linux-2.6.17-vanilla/include/asm-sh/landisk/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/landisk/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/landisk/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,4 @@ +/gio.h/1.1/Thu Sep 29 07:23:18 2005/-ko/ +/ide.h/1.1/Thu Sep 29 07:23:18 2005/-ko/ @@ -49201,17 +49394,17 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/landisk/CVS/Entries linux-2.6.17/i +D diff -ruN linux-2.6.17-vanilla/include/asm-sh/landisk/CVS/Repository linux-2.6.17/include/asm-sh/landisk/CVS/Repository --- linux-2.6.17-vanilla/include/asm-sh/landisk/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/landisk/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/landisk/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/include/asm-sh/landisk diff -ruN linux-2.6.17-vanilla/include/asm-sh/landisk/CVS/Root linux-2.6.17/include/asm-sh/landisk/CVS/Root --- linux-2.6.17-vanilla/include/asm-sh/landisk/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/landisk/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/landisk/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/include/asm-sh/landisk/gio.h linux-2.6.17/include/asm-sh/landisk/gio.h --- linux-2.6.17-vanilla/include/asm-sh/landisk/gio.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/landisk/gio.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/landisk/gio.h 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,45 @@ +#ifndef __ASM_SH_LANDISK_GIO_H +#define __ASM_SH_LANDISK_GIO_H @@ -49260,7 +49453,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/landisk/gio.h linux-2.6.17/include +#endif /* __ASM_SH_LANDISK_GIO_H */ diff -ruN linux-2.6.17-vanilla/include/asm-sh/landisk/ide.h linux-2.6.17/include/asm-sh/landisk/ide.h --- linux-2.6.17-vanilla/include/asm-sh/landisk/ide.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/landisk/ide.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/landisk/ide.h 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,14 @@ +/* + * modifed by kogiidena @@ -49278,7 +49471,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/landisk/ide.h linux-2.6.17/include +#endif /* __ASM_SH_LANDISK_IDE_H */ diff -ruN linux-2.6.17-vanilla/include/asm-sh/landisk/iodata_landisk.h linux-2.6.17/include/asm-sh/landisk/iodata_landisk.h --- linux-2.6.17-vanilla/include/asm-sh/landisk/iodata_landisk.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/landisk/iodata_landisk.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/landisk/iodata_landisk.h 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,79 @@ +#ifndef __ASM_SH_IODATA_LANDISK_H +#define __ASM_SH_IODATA_LANDISK_H @@ -49361,7 +49554,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/landisk/iodata_landisk.h linux-2.6 + diff -ruN linux-2.6.17-vanilla/include/asm-sh/mc146818rtc.h linux-2.6.17/include/asm-sh/mc146818rtc.h --- linux-2.6.17-vanilla/include/asm-sh/mc146818rtc.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/mc146818rtc.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/mc146818rtc.h 2006-07-07 10:17:07.000000000 +0000 @@ -24,7 +24,7 @@ #define CMOS_WRITE(val,addr) __CMOS_WRITE(val,addr,b) @@ -49373,7 +49566,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/mc146818rtc.h linux-2.6.17/include #define CMOS_READ(addr) secureedge5410_cmos_read(addr) diff -ruN linux-2.6.17-vanilla/include/asm-sh/mmu.h linux-2.6.17/include/asm-sh/mmu.h --- linux-2.6.17-vanilla/include/asm-sh/mmu.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/mmu.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/mmu.h 2006-07-07 10:17:07.000000000 +0000 @@ -25,5 +25,60 @@ typedef unsigned long mm_context_t; @@ -49438,7 +49631,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/mmu.h linux-2.6.17/include/asm-sh/ diff -ruN linux-2.6.17-vanilla/include/asm-sh/mmu_context.h linux-2.6.17/include/asm-sh/mmu_context.h --- linux-2.6.17-vanilla/include/asm-sh/mmu_context.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/mmu_context.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/mmu_context.h 2006-07-07 10:17:07.000000000 +0000 @@ -174,9 +174,7 @@ { /* Enable MMU */ @@ -49462,7 +49655,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/mmu_context.h linux-2.6.17/include /* diff -ruN linux-2.6.17-vanilla/include/asm-sh/mpc1211/CVS/Entries linux-2.6.17/include/asm-sh/mpc1211/CVS/Entries --- linux-2.6.17-vanilla/include/asm-sh/mpc1211/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/mpc1211/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/mpc1211/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,8 @@ +/dma.h/1.1/Fri May 16 17:19:08 2003/-ko/ +/io.h/1.3/Mon Aug 4 01:51:58 2003/-ko/ @@ -49474,17 +49667,17 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/mpc1211/CVS/Entries linux-2.6.17/i +D diff -ruN linux-2.6.17-vanilla/include/asm-sh/mpc1211/CVS/Repository linux-2.6.17/include/asm-sh/mpc1211/CVS/Repository --- linux-2.6.17-vanilla/include/asm-sh/mpc1211/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/mpc1211/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/mpc1211/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/include/asm-sh/mpc1211 diff -ruN linux-2.6.17-vanilla/include/asm-sh/mpc1211/CVS/Root linux-2.6.17/include/asm-sh/mpc1211/CVS/Root --- linux-2.6.17-vanilla/include/asm-sh/mpc1211/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/mpc1211/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/mpc1211/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/include/asm-sh/namei.h linux-2.6.17/include/asm-sh/namei.h --- linux-2.6.17-vanilla/include/asm-sh/namei.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/namei.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/namei.h 2006-07-07 10:17:07.000000000 +0000 @@ -1,4 +1,4 @@ -/* $Id: namei.h,v 1.3 2000/07/04 06:24:49 gniibe Exp $ +/* $Id: namei.h,v 1.2 2000/04/14 19:14:01 mjd Exp $ @@ -49493,7 +49686,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/namei.h linux-2.6.17/include/asm-s * Included from linux/fs/namei.c diff -ruN linux-2.6.17-vanilla/include/asm-sh/overdrive/CVS/Entries linux-2.6.17/include/asm-sh/overdrive/CVS/Entries --- linux-2.6.17-vanilla/include/asm-sh/overdrive/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/overdrive/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/overdrive/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,5 @@ +/fpga.h/1.2/Fri Nov 1 17:19:31 2002// +/gt64111.h/1.2/Fri Nov 1 17:19:31 2002// @@ -49502,17 +49695,17 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/overdrive/CVS/Entries linux-2.6.17 +D diff -ruN linux-2.6.17-vanilla/include/asm-sh/overdrive/CVS/Repository linux-2.6.17/include/asm-sh/overdrive/CVS/Repository --- linux-2.6.17-vanilla/include/asm-sh/overdrive/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/overdrive/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/overdrive/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/include/asm-sh/overdrive diff -ruN linux-2.6.17-vanilla/include/asm-sh/overdrive/CVS/Root linux-2.6.17/include/asm-sh/overdrive/CVS/Root --- linux-2.6.17-vanilla/include/asm-sh/overdrive/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/overdrive/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/overdrive/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/include/asm-sh/page.h linux-2.6.17/include/asm-sh/page.h --- linux-2.6.17-vanilla/include/asm-sh/page.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/page.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/page.h 2006-07-07 10:17:07.000000000 +0000 @@ -31,7 +31,6 @@ #define HPAGE_SIZE (1UL << HPAGE_SHIFT) #define HPAGE_MASK (~(HPAGE_SIZE-1)) @@ -49574,7 +49767,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/page.h linux-2.6.17/include/asm-sh #define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT) diff -ruN linux-2.6.17-vanilla/include/asm-sh/pci.h linux-2.6.17/include/asm-sh/pci.h --- linux-2.6.17-vanilla/include/asm-sh/pci.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/pci.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/pci.h 2006-07-07 10:17:07.000000000 +0000 @@ -32,6 +32,34 @@ #define PCIBIOS_MIN_IO board_pci_channels->io_resource->start #define PCIBIOS_MIN_MEM board_pci_channels->mem_resource->start @@ -49644,7 +49837,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/pci.h linux-2.6.17/include/asm-sh/ static inline void pcibios_add_platform_entries(struct pci_dev *dev) diff -ruN linux-2.6.17-vanilla/include/asm-sh/pgalloc.h linux-2.6.17/include/asm-sh/pgalloc.h --- linux-2.6.17-vanilla/include/asm-sh/pgalloc.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/pgalloc.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/pgalloc.h 2006-07-07 10:17:07.000000000 +0000 @@ -1,15 +1,6 @@ #ifndef __ASM_SH_PGALLOC_H #define __ASM_SH_PGALLOC_H @@ -49721,7 +49914,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/pgalloc.h linux-2.6.17/include/asm #endif /* __ASM_SH_PGALLOC_H */ diff -ruN linux-2.6.17-vanilla/include/asm-sh/pgtable.h linux-2.6.17/include/asm-sh/pgtable.h --- linux-2.6.17-vanilla/include/asm-sh/pgtable.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/pgtable.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/pgtable.h 2006-07-07 10:17:07.000000000 +0000 @@ -1,43 +1,43 @@ -#ifndef __ASM_SH_PGTABLE_H -#define __ASM_SH_PGTABLE_H @@ -49984,7 +50177,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/pgtable.h linux-2.6.17/include/asm diff -ruN linux-2.6.17-vanilla/include/asm-sh/pm.h linux-2.6.17/include/asm-sh/pm.h --- linux-2.6.17-vanilla/include/asm-sh/pm.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/pm.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/pm.h 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,17 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public @@ -50005,8 +50198,19 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/pm.h linux-2.6.17/include/asm-sh/p +#endif diff -ruN linux-2.6.17-vanilla/include/asm-sh/processor.h linux-2.6.17/include/asm-sh/processor.h --- linux-2.6.17-vanilla/include/asm-sh/processor.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/processor.h 2006-07-06 12:42:57.000000000 +0000 -@@ -265,5 +265,18 @@ ++++ linux-2.6.17/include/asm-sh/processor.h 2006-07-07 10:17:07.000000000 +0000 +@@ -148,6 +148,10 @@ + union sh_fpu_union fpu; + }; + ++typedef struct { ++ unsigned long seg; ++} mm_segment_t; ++ + /* Count of active tasks with UBC settings */ + extern int ubc_usercnt; + +@@ -265,5 +269,18 @@ #define cpu_sleep() __asm__ __volatile__ ("sleep" : : : "memory") #define cpu_relax() do { } while (0) @@ -50027,24 +50231,24 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/processor.h linux-2.6.17/include/a #endif /* __ASM_SH_PROCESSOR_H */ diff -ruN linux-2.6.17-vanilla/include/asm-sh/r7780rp/CVS/Entries linux-2.6.17/include/asm-sh/r7780rp/CVS/Entries --- linux-2.6.17-vanilla/include/asm-sh/r7780rp/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/r7780rp/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/r7780rp/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,3 @@ +/ide.h/1.1/Sat Jan 7 19:55:57 2006/-ko/ +/r7780rp.h/1.3/Thu Jul 6 12:38:31 2006/-ko/ +D diff -ruN linux-2.6.17-vanilla/include/asm-sh/r7780rp/CVS/Repository linux-2.6.17/include/asm-sh/r7780rp/CVS/Repository --- linux-2.6.17-vanilla/include/asm-sh/r7780rp/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/r7780rp/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/r7780rp/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/include/asm-sh/r7780rp diff -ruN linux-2.6.17-vanilla/include/asm-sh/r7780rp/CVS/Root linux-2.6.17/include/asm-sh/r7780rp/CVS/Root --- linux-2.6.17-vanilla/include/asm-sh/r7780rp/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/r7780rp/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/r7780rp/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/include/asm-sh/r7780rp/ide.h linux-2.6.17/include/asm-sh/r7780rp/ide.h --- linux-2.6.17-vanilla/include/asm-sh/r7780rp/ide.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/r7780rp/ide.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/r7780rp/ide.h 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,8 @@ +#ifndef __ASM_SH_R7780RP_IDE_H +#define __ASM_SH_R7780RP_IDE_H @@ -50056,7 +50260,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/r7780rp/ide.h linux-2.6.17/include + diff -ruN linux-2.6.17-vanilla/include/asm-sh/r7780rp/r7780rp.h linux-2.6.17/include/asm-sh/r7780rp/r7780rp.h --- linux-2.6.17-vanilla/include/asm-sh/r7780rp/r7780rp.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/r7780rp/r7780rp.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/r7780rp/r7780rp.h 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,177 @@ +#ifndef __ASM_SH_RENESAS_R7780RP_H +#define __ASM_SH_RENESAS_R7780RP_H @@ -50237,7 +50441,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/r7780rp/r7780rp.h linux-2.6.17/inc +#endif /* __ASM_SH_RENESAS_R7780RP */ diff -ruN linux-2.6.17-vanilla/include/asm-sh/rts7751r2d/CVS/Entries linux-2.6.17/include/asm-sh/rts7751r2d/CVS/Entries --- linux-2.6.17-vanilla/include/asm-sh/rts7751r2d/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/rts7751r2d/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/rts7751r2d/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,4 @@ +/ide.h/1.1/Wed Apr 21 00:09:19 2004/-ko/ +/rts7751r2d.h/1.3/Wed Jan 18 05:43:02 2006/-ko/ @@ -50245,17 +50449,17 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/rts7751r2d/CVS/Entries linux-2.6.1 +D diff -ruN linux-2.6.17-vanilla/include/asm-sh/rts7751r2d/CVS/Repository linux-2.6.17/include/asm-sh/rts7751r2d/CVS/Repository --- linux-2.6.17-vanilla/include/asm-sh/rts7751r2d/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/rts7751r2d/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/rts7751r2d/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/include/asm-sh/rts7751r2d diff -ruN linux-2.6.17-vanilla/include/asm-sh/rts7751r2d/CVS/Root linux-2.6.17/include/asm-sh/rts7751r2d/CVS/Root --- linux-2.6.17-vanilla/include/asm-sh/rts7751r2d/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/rts7751r2d/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/rts7751r2d/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/include/asm-sh/rts7751r2d/rts7751r2d.h linux-2.6.17/include/asm-sh/rts7751r2d/rts7751r2d.h --- linux-2.6.17-vanilla/include/asm-sh/rts7751r2d/rts7751r2d.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/rts7751r2d/rts7751r2d.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/rts7751r2d/rts7751r2d.h 2006-07-07 10:17:07.000000000 +0000 @@ -41,8 +41,6 @@ #define PA_AX88796L 0xaa000400 /* AX88796L Area */ @@ -50275,24 +50479,24 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/rts7751r2d/rts7751r2d.h linux-2.6. #endif /* __ASM_SH_RENESAS_RTS7751R2D */ diff -ruN linux-2.6.17-vanilla/include/asm-sh/saturn/CVS/Entries linux-2.6.17/include/asm-sh/saturn/CVS/Entries --- linux-2.6.17-vanilla/include/asm-sh/saturn/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/saturn/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/saturn/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,3 @@ +/io.h/1.3/Tue Jul 29 14:27:12 2003/-ko/ +/smpc.h/1.2/Sun May 4 19:30:16 2003/-ko/ +D diff -ruN linux-2.6.17-vanilla/include/asm-sh/saturn/CVS/Repository linux-2.6.17/include/asm-sh/saturn/CVS/Repository --- linux-2.6.17-vanilla/include/asm-sh/saturn/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/saturn/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/saturn/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/include/asm-sh/saturn diff -ruN linux-2.6.17-vanilla/include/asm-sh/saturn/CVS/Root linux-2.6.17/include/asm-sh/saturn/CVS/Root --- linux-2.6.17-vanilla/include/asm-sh/saturn/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/saturn/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/saturn/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/include/asm-sh/scatterlist.h linux-2.6.17/include/asm-sh/scatterlist.h --- linux-2.6.17-vanilla/include/asm-sh/scatterlist.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/scatterlist.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/scatterlist.h 2006-07-07 10:17:07.000000000 +0000 @@ -10,4 +10,13 @@ #define ISA_DMA_THRESHOLD (0x1fffffff) @@ -50309,7 +50513,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/scatterlist.h linux-2.6.17/include #endif /* !(__ASM_SH_SCATTERLIST_H) */ diff -ruN linux-2.6.17-vanilla/include/asm-sh/se.h linux-2.6.17/include/asm-sh/se.h --- linux-2.6.17-vanilla/include/asm-sh/se.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/se.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/se.h 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,80 @@ +#ifndef __ASM_SH_HITACHI_SE_H +#define __ASM_SH_HITACHI_SE_H @@ -50393,7 +50597,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/se.h linux-2.6.17/include/asm-sh/s +#endif /* __ASM_SH_HITACHI_SE_H */ diff -ruN linux-2.6.17-vanilla/include/asm-sh/se7300.h linux-2.6.17/include/asm-sh/se7300.h --- linux-2.6.17-vanilla/include/asm-sh/se7300.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/se7300.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/se7300.h 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,64 @@ +#ifndef __ASM_SH_HITACHI_SE7300_H +#define __ASM_SH_HITACHI_SE7300_H @@ -50461,7 +50665,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/se7300.h linux-2.6.17/include/asm- +#endif /* __ASM_SH_HITACHI_SE7300_H */ diff -ruN linux-2.6.17-vanilla/include/asm-sh/se73180.h linux-2.6.17/include/asm-sh/se73180.h --- linux-2.6.17-vanilla/include/asm-sh/se73180.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/se73180.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/se73180.h 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,65 @@ +#ifndef __ASM_SH_HITACHI_SE73180_H +#define __ASM_SH_HITACHI_SE73180_H @@ -50530,7 +50734,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/se73180.h linux-2.6.17/include/asm +#endif /* __ASM_SH_HITACHI_SE73180_H */ diff -ruN linux-2.6.17-vanilla/include/asm-sh/se7751.h linux-2.6.17/include/asm-sh/se7751.h --- linux-2.6.17-vanilla/include/asm-sh/se7751.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/se7751.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/se7751.h 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,71 @@ +#ifndef __ASM_SH_HITACHI_7751SE_H +#define __ASM_SH_HITACHI_7751SE_H @@ -50605,7 +50809,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/se7751.h linux-2.6.17/include/asm- +#endif /* __ASM_SH_HITACHI_7751SE_H */ diff -ruN linux-2.6.17-vanilla/include/asm-sh/sh03/CVS/Entries linux-2.6.17/include/asm-sh/sh03/CVS/Entries --- linux-2.6.17-vanilla/include/asm-sh/sh03/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/sh03/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/sh03/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,4 @@ +/ide.h/1.1/Fri Dec 3 01:43:33 2004/-ko/ +/io.h/1.2/Wed Jan 4 18:27:49 2006/-ko/ @@ -50613,17 +50817,17 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/sh03/CVS/Entries linux-2.6.17/incl +D diff -ruN linux-2.6.17-vanilla/include/asm-sh/sh03/CVS/Repository linux-2.6.17/include/asm-sh/sh03/CVS/Repository --- linux-2.6.17-vanilla/include/asm-sh/sh03/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/sh03/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/sh03/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/include/asm-sh/sh03 diff -ruN linux-2.6.17-vanilla/include/asm-sh/sh03/CVS/Root linux-2.6.17/include/asm-sh/sh03/CVS/Root --- linux-2.6.17-vanilla/include/asm-sh/sh03/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/sh03/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/sh03/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/include/asm-sh/sh03/io.h linux-2.6.17/include/asm-sh/sh03/io.h --- linux-2.6.17-vanilla/include/asm-sh/sh03/io.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/sh03/io.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/sh03/io.h 2006-07-07 10:17:07.000000000 +0000 @@ -33,14 +33,6 @@ #define IRL3_IPR_POS 0 #define IRL3_PRIORITY 4 @@ -50642,23 +50846,23 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/sh03/io.h linux-2.6.17/include/asm #endif /* _ASM_SH_IO_SH03_H */ diff -ruN linux-2.6.17-vanilla/include/asm-sh/sh2000/CVS/Entries linux-2.6.17/include/asm-sh/sh2000/CVS/Entries --- linux-2.6.17-vanilla/include/asm-sh/sh2000/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/sh2000/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/sh2000/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,2 @@ +/sh2000.h/1.2/Fri Nov 1 17:19:31 2002// +D diff -ruN linux-2.6.17-vanilla/include/asm-sh/sh2000/CVS/Repository linux-2.6.17/include/asm-sh/sh2000/CVS/Repository --- linux-2.6.17-vanilla/include/asm-sh/sh2000/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/sh2000/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/sh2000/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/include/asm-sh/sh2000 diff -ruN linux-2.6.17-vanilla/include/asm-sh/sh2000/CVS/Root linux-2.6.17/include/asm-sh/sh2000/CVS/Root --- linux-2.6.17-vanilla/include/asm-sh/sh2000/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/sh2000/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/sh2000/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/include/asm-sh/smc37c93x.h linux-2.6.17/include/asm-sh/smc37c93x.h --- linux-2.6.17-vanilla/include/asm-sh/smc37c93x.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/smc37c93x.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/smc37c93x.h 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,190 @@ +#ifndef __ASM_SH_SMC37C93X_H +#define __ASM_SH_SMC37C93X_H @@ -50852,7 +51056,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/smc37c93x.h linux-2.6.17/include/a +#endif /* __ASM_SH_SMC37C93X_H */ diff -ruN linux-2.6.17-vanilla/include/asm-sh/smp.h linux-2.6.17/include/asm-sh/smp.h --- linux-2.6.17-vanilla/include/asm-sh/smp.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/smp.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/smp.h 2006-07-07 10:17:07.000000000 +0000 @@ -20,11 +20,6 @@ #include <asm/atomic.h> #include <asm/current.h> @@ -50867,7 +51071,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/smp.h linux-2.6.17/include/asm-sh/ /* I've no idea what the real meaning of this is */ diff -ruN linux-2.6.17-vanilla/include/asm-sh/snapgear.h linux-2.6.17/include/asm-sh/snapgear.h --- linux-2.6.17-vanilla/include/asm-sh/snapgear.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/snapgear.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/snapgear.h 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,79 @@ +/* + * include/asm-sh/snapgear/io.h @@ -50950,7 +51154,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/snapgear.h linux-2.6.17/include/as +#endif /* _ASM_SH_IO_SNAPGEAR_H */ diff -ruN linux-2.6.17-vanilla/include/asm-sh/system.h linux-2.6.17/include/asm-sh/system.h --- linux-2.6.17-vanilla/include/asm-sh/system.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/system.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/system.h 2006-07-07 10:17:07.000000000 +0000 @@ -7,6 +7,7 @@ */ @@ -51219,7 +51423,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/system.h linux-2.6.17/include/asm- */ diff -ruN linux-2.6.17-vanilla/include/asm-sh/systemh7751.h linux-2.6.17/include/asm-sh/systemh7751.h --- linux-2.6.17-vanilla/include/asm-sh/systemh7751.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/systemh7751.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/systemh7751.h 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,71 @@ +#ifndef __ASM_SH_SYSTEMH_7751SYSTEMH_H +#define __ASM_SH_SYSTEMH_7751SYSTEMH_H @@ -51294,8 +51498,26 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/systemh7751.h linux-2.6.17/include +#endif /* __ASM_SH_SYSTEMH_7751SYSTEMH_H */ diff -ruN linux-2.6.17-vanilla/include/asm-sh/thread_info.h linux-2.6.17/include/asm-sh/thread_info.h --- linux-2.6.17-vanilla/include/asm-sh/thread_info.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/thread_info.h 2006-07-06 12:42:57.000000000 +0000 -@@ -48,16 +48,29 @@ ++++ linux-2.6.17/include/asm-sh/thread_info.h 2006-07-07 10:17:07.000000000 +0000 +@@ -20,7 +20,8 @@ + struct exec_domain *exec_domain; /* execution domain */ + unsigned long flags; /* low level flags */ + __u32 cpu; +- int preempt_count; /* 0 => preemptable, <0 => BUG */ ++ int preempt_count; /* 0 => preemptable, <0 => BUG */ ++ mm_segment_t addr_limit; /* thread address space */ + struct restart_block restart_block; + __u8 supervisor_stack[0]; + }; +@@ -40,6 +41,7 @@ + .flags = 0, \ + .cpu = 0, \ + .preempt_count = 1, \ ++ .addr_limit = KERNEL_DS, \ + .restart_block = { \ + .fn = do_no_restart_syscall, \ + }, \ +@@ -48,16 +50,29 @@ #define init_thread_info (init_thread_union.thread_info) #define init_stack (init_thread_union.stack) @@ -51326,7 +51548,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/thread_info.h linux-2.6.17/include #define alloc_thread_info(ti) ((struct thread_info *) __get_free_pages(GFP_KERNEL,1)) #define free_thread_info(ti) free_pages((unsigned long) (ti), 1) -@@ -65,7 +78,7 @@ +@@ -65,7 +80,7 @@ /* how to get the thread information struct from ASM */ #define GET_THREAD_INFO(reg) \ @@ -51335,9 +51557,25 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/thread_info.h linux-2.6.17/include #endif +@@ -82,7 +97,6 @@ + #define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */ + #define TIF_POLLING_NRFLAG 17 /* true if poll_idle() is polling TIF_NEED_RESCHED */ + #define TIF_MEMDIE 18 +-#define TIF_USERSPACE 31 /* true if FS sets userspace */ + + #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) + #define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME) +@@ -90,7 +104,6 @@ + #define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED) + #define _TIF_USEDFPU (1<<TIF_USEDFPU) + #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG) +-#define _TIF_USERSPACE (1<<TIF_USERSPACE) + + #define _TIF_WORK_MASK 0x000000FE /* work to do on interrupt/exception return */ + #define _TIF_ALLWORK_MASK 0x000000FF /* work to do on any return to u-space */ diff -ruN linux-2.6.17-vanilla/include/asm-sh/timer.h linux-2.6.17/include/asm-sh/timer.h --- linux-2.6.17-vanilla/include/asm-sh/timer.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/timer.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/timer.h 2006-07-07 10:17:07.000000000 +0000 @@ -6,6 +6,8 @@ struct sys_timer_ops { @@ -51349,7 +51587,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/timer.h linux-2.6.17/include/asm-s }; diff -ruN linux-2.6.17-vanilla/include/asm-sh/timex.h linux-2.6.17/include/asm-sh/timex.h --- linux-2.6.17-vanilla/include/asm-sh/timex.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/timex.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/timex.h 2006-07-07 10:17:07.000000000 +0000 @@ -6,7 +6,7 @@ #ifndef __ASM_SH_TIMEX_H #define __ASM_SH_TIMEX_H @@ -51361,7 +51599,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/timex.h linux-2.6.17/include/asm-s diff -ruN linux-2.6.17-vanilla/include/asm-sh/titan.h linux-2.6.17/include/asm-sh/titan.h --- linux-2.6.17-vanilla/include/asm-sh/titan.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/titan.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/titan.h 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,43 @@ +/* + * Platform defintions for Titan @@ -51408,7 +51646,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/titan.h linux-2.6.17/include/asm-s +#endif diff -ruN linux-2.6.17-vanilla/include/asm-sh/uaccess.h linux-2.6.17/include/asm-sh/uaccess.h --- linux-2.6.17-vanilla/include/asm-sh/uaccess.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/asm-sh/uaccess.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/uaccess.h 2006-07-07 10:17:07.000000000 +0000 @@ -1,5 +1,4 @@ -/* $Id: uaccess.h,v 1.11 2003/10/13 07:21:20 lethal Exp $ - * @@ -51416,26 +51654,186 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/uaccess.h linux-2.6.17/include/asm * User space memory access functions * * Copyright (C) 1999, 2002 Niibe Yutaka +@@ -16,21 +15,9 @@ + #include <linux/errno.h> + #include <linux/sched.h> + +-/* +- * NOTE: Macro/functions in this file depends on threads_info.h implementation. +- * Assumes: +- * TI_FLAGS == 8 +- * TIF_USERSPACE == 31 +- * USER_ADDR_LIMIT == 0x80000000 +- */ +- + #define VERIFY_READ 0 + #define VERIFY_WRITE 1 + +-typedef struct { +- unsigned int is_user_space; +-} mm_segment_t; +- + /* + * The fs value determines whether argument validity checking should be + * performed or not. If get_fs() == USER_DS, checking is performed, with +@@ -40,12 +27,14 @@ + */ + + #define MAKE_MM_SEG(s) ((mm_segment_t) { (s) }) +-#define segment_eq(a,b) ((a).is_user_space == (b).is_user_space) + +-#define USER_ADDR_LIMIT 0x80000000 ++#define KERNEL_DS MAKE_MM_SEG(0xFFFFFFFFUL) ++#define USER_DS MAKE_MM_SEG(PAGE_OFFSET) + +-#define KERNEL_DS MAKE_MM_SEG(0) +-#define USER_DS MAKE_MM_SEG(1) ++#define segment_eq(a,b) ((a).seg == (b).seg) ++ ++#define __addr_ok(addr) \ ++ ((unsigned long)(addr) < (current_thread_info()->addr_limit.seg)) + + #define get_ds() (KERNEL_DS) + +@@ -76,31 +65,8 @@ + return ((addr >= memory_start) && ((addr + size) < memory_end)); + } + #else /* CONFIG_MMU */ +-static inline mm_segment_t get_fs(void) +-{ +- return MAKE_MM_SEG(test_thread_flag(TIF_USERSPACE)); +-} +- +-static inline void set_fs(mm_segment_t s) +-{ +- unsigned long ti, flag; +- __asm__ __volatile__( +- "stc r7_bank, %0\n\t" +- "mov.l @(8,%0), %1\n\t" +- "shal %1\n\t" +- "cmp/pl %2\n\t" +- "rotcr %1\n\t" +- "mov.l %1, @(8,%0)" +- : "=&r" (ti), "=&r" (flag) +- : "r" (s.is_user_space) +- : "t"); +-/**** +- if (s.is_user_space) +- set_thread_flag(TIF_USERSPACE); +- else +- clear_thread_flag(TIF_USERSPACE); +-****/ +-} ++#define get_fs() (current_thread_info()->addr_limit) ++#define set_fs(x) (current_thread_info()->addr_limit = (x)) + + /* + * __access_ok: Check if address with size is OK or not. +@@ -108,7 +74,7 @@ + * We do three checks: + * (1) is it user space? + * (2) addr + size --> carry? +- * (3) addr + size >= 0x80000000 (USER_ADDR_LIMIT) ++ * (3) addr + size >= 0x80000000 (PAGE_OFFSET) + * + * (1) (2) (3) | RESULT + * 0 0 0 | ok +@@ -541,7 +507,7 @@ + "3:\n\t" + "mov.l 4f, %1\n\t" + "jmp @%1\n\t" +- " mov %5, %0\n" ++ " mov #0, %0\n" + ".balign 4\n" + "4: .long 2b\n" + ".previous\n" +@@ -550,26 +516,20 @@ + " .long 1b,3b\n" + ".previous" + : "=z" (res), "=&r" (__dummy) +- : "0" (0), "r" (__s), "r" (__n), "i" (-EFAULT) ++ : "0" (0), "r" (__s), "r" (__n) + : "t"); + return res; + } + + static __inline__ long strnlen_user(const char __user *s, long n) + { +- if (!access_ok(VERIFY_READ, s, n)) ++ if (!__addr_ok(s)) + return 0; + else + return __strnlen_user(s, n); + } + +-static __inline__ long strlen_user(const char __user *s) +-{ +- if (!access_ok(VERIFY_READ, s, 0)) +- return 0; +- else +- return __strnlen_user(s, ~0UL >> 1); +-} ++#define strlen_user(str) strnlen_user(str, ~0UL >> 1) + + /* + * The exception table consists of pairs of addresses: the first is the +diff -ruN linux-2.6.17-vanilla/include/asm-sh/unistd.h linux-2.6.17/include/asm-sh/unistd.h +--- linux-2.6.17-vanilla/include/asm-sh/unistd.h 2006-06-18 01:49:35.000000000 +0000 ++++ linux-2.6.17/include/asm-sh/unistd.h 2006-07-07 10:17:07.000000000 +0000 +@@ -300,9 +300,31 @@ + #define __NR_inotify_init 290 + #define __NR_inotify_add_watch 291 + #define __NR_inotify_rm_watch 292 ++#define __NR_migrate_pages 293 ++#define __NR_openat 294 ++#define __NR_mkdirat 295 ++#define __NR_mknodat 296 ++#define __NR_fchownat 297 ++#define __NR_futimesat 298 ++#define __NR_fstatat64 299 ++#define __NR_unlinkat 300 ++#define __NR_renameat 301 ++#define __NR_linkat 302 ++#define __NR_symlinkat 303 ++#define __NR_readlinkat 304 ++#define __NR_fchmodat 305 ++#define __NR_faccessat 305 ++#define __NR_pselect6 307 ++#define __NR_ppoll 308 ++#define __NR_unshare 309 ++#define __NR_set_robust_list 310 ++#define __NR_get_robust_list 311 ++#define __NR_splice 312 ++#define __NR_sync_file_range 313 ++#define __NR_tee 314 ++#define __NR_vmsplice 315 + +- +-#define NR_syscalls 293 ++#define NR_syscalls 316 + + /* user-visible error numbers are in the range -1 - -124: see <asm-sh/errno.h> */ + diff -ruN linux-2.6.17-vanilla/include/linux/CVS/Entries linux-2.6.17/include/linux/CVS/Entries --- linux-2.6.17-vanilla/include/linux/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/linux/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/linux/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,3 @@ +/superhyway.h/1.2/Thu Mar 17 07:43:07 2005/-ko/ +/i2c-id.h/1.11/Wed Jul 5 14:51:55 2006/-ko/ +D diff -ruN linux-2.6.17-vanilla/include/linux/CVS/Repository linux-2.6.17/include/linux/CVS/Repository --- linux-2.6.17-vanilla/include/linux/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/linux/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/linux/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/include/linux diff -ruN linux-2.6.17-vanilla/include/linux/CVS/Root linux-2.6.17/include/linux/CVS/Root --- linux-2.6.17-vanilla/include/linux/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/linux/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/linux/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/include/linux/i2c-id.h linux-2.6.17/include/linux/i2c-id.h --- linux-2.6.17-vanilla/include/linux/i2c-id.h 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/include/linux/i2c-id.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/linux/i2c-id.h 2006-07-07 10:17:07.000000000 +0000 @@ -245,6 +245,7 @@ #define I2C_HW_SMBUS_OV518 0x04000f /* OV518(+) USB 1.1 webcam ICs */ #define I2C_HW_SMBUS_OV519 0x040010 /* OV519 USB 1.1 webcam IC */ @@ -51446,23 +51844,23 @@ diff -ruN linux-2.6.17-vanilla/include/linux/i2c-id.h linux-2.6.17/include/linux #define I2C_HW_ISA 0x050000 diff -ruN linux-2.6.17-vanilla/include/video/CVS/Entries linux-2.6.17/include/video/CVS/Entries --- linux-2.6.17-vanilla/include/video/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/video/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/video/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,2 @@ +/voyager.h/1.1/Wed Apr 21 00:09:20 2004/-ko/ +D diff -ruN linux-2.6.17-vanilla/include/video/CVS/Repository linux-2.6.17/include/video/CVS/Repository --- linux-2.6.17-vanilla/include/video/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/video/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/video/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/include/video diff -ruN linux-2.6.17-vanilla/include/video/CVS/Root linux-2.6.17/include/video/CVS/Root --- linux-2.6.17-vanilla/include/video/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/video/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/video/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/include/video/voyager.h linux-2.6.17/include/video/voyager.h --- linux-2.6.17-vanilla/include/video/voyager.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/include/video/voyager.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/include/video/voyager.h 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,39 @@ +#define VOY_REG_TOP 0xb3e00000 //voyager register +#define VOY_VRAM_TOP0 0xb0400000 //PANEL PLANE @@ -51505,24 +51903,24 @@ diff -ruN linux-2.6.17-vanilla/include/video/voyager.h linux-2.6.17/include/vide +#define VOYAGER_IOCTL_ALPHA 0x60 diff -ruN linux-2.6.17-vanilla/lib/CVS/Entries linux-2.6.17/lib/CVS/Entries --- linux-2.6.17-vanilla/lib/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/lib/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/lib/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,3 @@ +/Kconfig.debug/1.4/Wed Jul 5 14:51:56 2006/-ko/ +/bitmap.c/1.5/Wed Jul 5 14:51:56 2006/-ko/ +D diff -ruN linux-2.6.17-vanilla/lib/CVS/Repository linux-2.6.17/lib/CVS/Repository --- linux-2.6.17-vanilla/lib/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/lib/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/lib/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/lib diff -ruN linux-2.6.17-vanilla/lib/CVS/Root linux-2.6.17/lib/CVS/Root --- linux-2.6.17-vanilla/lib/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/lib/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/lib/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/lib/Kconfig.debug linux-2.6.17/lib/Kconfig.debug --- linux-2.6.17-vanilla/lib/Kconfig.debug 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/lib/Kconfig.debug 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/lib/Kconfig.debug 2006-07-07 10:17:07.000000000 +0000 @@ -178,7 +178,7 @@ config FRAME_POINTER @@ -51534,7 +51932,7 @@ diff -ruN linux-2.6.17-vanilla/lib/Kconfig.debug linux-2.6.17/lib/Kconfig.debug If you say Y here the resulting kernel image will be slightly larger diff -ruN linux-2.6.17-vanilla/lib/bitmap.c linux-2.6.17/lib/bitmap.c --- linux-2.6.17-vanilla/lib/bitmap.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/lib/bitmap.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/lib/bitmap.c 2006-07-07 10:17:07.000000000 +0000 @@ -525,7 +525,7 @@ ord = 0; while (i < pos) { @@ -51556,30 +51954,25 @@ diff -ruN linux-2.6.17-vanilla/lib/bitmap.c linux-2.6.17/lib/bitmap.c * Return the bit offset in bitmap of the allocated region, * or -errno on failure. */ -diff -ruN linux-2.6.17-vanilla/localversion-sh linux-2.6.17/localversion-sh ---- linux-2.6.17-vanilla/localversion-sh 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/localversion-sh 2006-07-06 12:42:57.000000000 +0000 -@@ -0,0 +1 @@ -+-sh diff -ruN linux-2.6.17-vanilla/mm/CVS/Entries linux-2.6.17/mm/CVS/Entries --- linux-2.6.17-vanilla/mm/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/mm/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/mm/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,2 @@ +/memory.c/1.66/Wed Jul 5 14:51:57 2006/-ko/ +D diff -ruN linux-2.6.17-vanilla/mm/CVS/Repository linux-2.6.17/mm/CVS/Repository --- linux-2.6.17-vanilla/mm/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/mm/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/mm/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/mm diff -ruN linux-2.6.17-vanilla/mm/CVS/Root linux-2.6.17/mm/CVS/Root --- linux-2.6.17-vanilla/mm/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/mm/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/mm/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/mm/memory.c linux-2.6.17/mm/memory.c --- linux-2.6.17-vanilla/mm/memory.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/mm/memory.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/mm/memory.c 2006-07-07 10:17:07.000000000 +0000 @@ -1455,7 +1455,9 @@ int reuse = can_share_swap_page(old_page); unlock_page(old_page); @@ -51592,38 +51985,38 @@ diff -ruN linux-2.6.17-vanilla/mm/memory.c linux-2.6.17/mm/memory.c ptep_set_access_flags(vma, address, page_table, entry, 1); diff -ruN linux-2.6.17-vanilla/net/CVS/Entries linux-2.6.17/net/CVS/Entries --- linux-2.6.17-vanilla/net/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/net/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/net/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +D/ipv4//// diff -ruN linux-2.6.17-vanilla/net/CVS/Repository linux-2.6.17/net/CVS/Repository --- linux-2.6.17-vanilla/net/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/net/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/net/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/net diff -ruN linux-2.6.17-vanilla/net/CVS/Root linux-2.6.17/net/CVS/Root --- linux-2.6.17-vanilla/net/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/net/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/net/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/net/ipv4/CVS/Entries linux-2.6.17/net/ipv4/CVS/Entries --- linux-2.6.17-vanilla/net/ipv4/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/net/ipv4/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/net/ipv4/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,2 @@ +/ipconfig.c/1.12/Wed Jul 5 14:51:59 2006/-ko/ +D diff -ruN linux-2.6.17-vanilla/net/ipv4/CVS/Repository linux-2.6.17/net/ipv4/CVS/Repository --- linux-2.6.17-vanilla/net/ipv4/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/net/ipv4/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/net/ipv4/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/net/ipv4 diff -ruN linux-2.6.17-vanilla/net/ipv4/CVS/Root linux-2.6.17/net/ipv4/CVS/Root --- linux-2.6.17-vanilla/net/ipv4/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/net/ipv4/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/net/ipv4/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/net/ipv4/ipconfig.c linux-2.6.17/net/ipv4/ipconfig.c --- linux-2.6.17-vanilla/net/ipv4/ipconfig.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/net/ipv4/ipconfig.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/net/ipv4/ipconfig.c 2006-07-07 10:17:07.000000000 +0000 @@ -113,7 +113,7 @@ */ int ic_set_manually __initdata = 0; /* IPconfig parameters set manually */ @@ -51635,24 +52028,24 @@ diff -ruN linux-2.6.17-vanilla/net/ipv4/ipconfig.c linux-2.6.17/net/ipv4/ipconfi int ic_proto_enabled __initdata = 0 diff -ruN linux-2.6.17-vanilla/scripts/CVS/Entries linux-2.6.17/scripts/CVS/Entries --- linux-2.6.17-vanilla/scripts/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/scripts/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/scripts/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,3 @@ +/treelink.sh/1.3/Sun Jan 4 18:30:15 2004// +/treeunlink.sh/1.3/Sun Jan 4 18:30:15 2004// +D diff -ruN linux-2.6.17-vanilla/scripts/CVS/Repository linux-2.6.17/scripts/CVS/Repository --- linux-2.6.17-vanilla/scripts/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/scripts/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/scripts/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/scripts diff -ruN linux-2.6.17-vanilla/scripts/CVS/Root linux-2.6.17/scripts/CVS/Root --- linux-2.6.17-vanilla/scripts/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/scripts/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/scripts/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/scripts/treelink.sh linux-2.6.17/scripts/treelink.sh --- linux-2.6.17-vanilla/scripts/treelink.sh 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/scripts/treelink.sh 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/scripts/treelink.sh 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,49 @@ +#!/bin/sh +# @@ -51705,7 +52098,7 @@ diff -ruN linux-2.6.17-vanilla/scripts/treelink.sh linux-2.6.17/scripts/treelink +echo -e "done." diff -ruN linux-2.6.17-vanilla/scripts/treeunlink.sh linux-2.6.17/scripts/treeunlink.sh --- linux-2.6.17-vanilla/scripts/treeunlink.sh 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/scripts/treeunlink.sh 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/scripts/treeunlink.sh 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,37 @@ +#!/bin/sh +# @@ -51746,7 +52139,7 @@ diff -ruN linux-2.6.17-vanilla/scripts/treeunlink.sh linux-2.6.17/scripts/treeun +echo -e "done." diff -ruN linux-2.6.17-vanilla/sound/CVS/Entries linux-2.6.17/sound/CVS/Entries --- linux-2.6.17-vanilla/sound/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/sound/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/sound/CVS/Entries 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1,4 @@ +/Kconfig/1.1/Sun Jun 4 12:13:04 2006// +/Makefile/1.1/Sun Jun 4 12:13:04 2006// @@ -51754,17 +52147,17 @@ diff -ruN linux-2.6.17-vanilla/sound/CVS/Entries linux-2.6.17/sound/CVS/Entries +D/sh//// diff -ruN linux-2.6.17-vanilla/sound/CVS/Repository linux-2.6.17/sound/CVS/Repository --- linux-2.6.17-vanilla/sound/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/sound/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/sound/CVS/Repository 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +linux/sound diff -ruN linux-2.6.17-vanilla/sound/CVS/Root linux-2.6.17/sound/CVS/Root --- linux-2.6.17-vanilla/sound/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/sound/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/sound/CVS/Root 2006-07-07 10:17:07.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/sound/Kconfig linux-2.6.17/sound/Kconfig --- linux-2.6.17-vanilla/sound/Kconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/sound/Kconfig 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/sound/Kconfig 2006-07-07 10:17:08.000000000 +0000 @@ -62,6 +62,8 @@ source "sound/mips/Kconfig" @@ -51776,7 +52169,7 @@ diff -ruN linux-2.6.17-vanilla/sound/Kconfig linux-2.6.17/sound/Kconfig source "sound/usb/Kconfig" diff -ruN linux-2.6.17-vanilla/sound/Makefile linux-2.6.17/sound/Makefile --- linux-2.6.17-vanilla/sound/Makefile 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/sound/Makefile 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/sound/Makefile 2006-07-07 10:17:08.000000000 +0000 @@ -4,7 +4,7 @@ obj-$(CONFIG_SOUND) += soundcore.o obj-$(CONFIG_SOUND_PRIME) += oss/ @@ -51788,7 +52181,7 @@ diff -ruN linux-2.6.17-vanilla/sound/Makefile linux-2.6.17/sound/Makefile obj-y += last.o diff -ruN linux-2.6.17-vanilla/sound/oss/CVS/Entries linux-2.6.17/sound/oss/CVS/Entries --- linux-2.6.17-vanilla/sound/oss/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/sound/oss/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/sound/oss/CVS/Entries 2006-07-07 10:17:08.000000000 +0000 @@ -0,0 +1,7 @@ +/Makefile/1.7/Mon Aug 29 21:01:20 2005/-ko/ +/voyagergx_8051.c/1.2/Sat Jun 26 15:29:38 2004/-ko/ @@ -51799,17 +52192,17 @@ diff -ruN linux-2.6.17-vanilla/sound/oss/CVS/Entries linux-2.6.17/sound/oss/CVS/ +D diff -ruN linux-2.6.17-vanilla/sound/oss/CVS/Repository linux-2.6.17/sound/oss/CVS/Repository --- linux-2.6.17-vanilla/sound/oss/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/sound/oss/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/sound/oss/CVS/Repository 2006-07-07 10:17:08.000000000 +0000 @@ -0,0 +1 @@ +linux/sound/oss diff -ruN linux-2.6.17-vanilla/sound/oss/CVS/Root linux-2.6.17/sound/oss/CVS/Root --- linux-2.6.17-vanilla/sound/oss/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/sound/oss/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/sound/oss/CVS/Root 2006-07-07 10:17:08.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/sound/oss/Kconfig linux-2.6.17/sound/oss/Kconfig --- linux-2.6.17-vanilla/sound/oss/Kconfig 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/sound/oss/Kconfig 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/sound/oss/Kconfig 2006-07-07 10:17:08.000000000 +0000 @@ -833,6 +833,12 @@ tristate "XpressAudio Sound Blaster emulation" depends on SOUND_SB @@ -51825,7 +52218,7 @@ diff -ruN linux-2.6.17-vanilla/sound/oss/Kconfig linux-2.6.17/sound/oss/Kconfig depends on SOUND_PRIME && CPU_SH3 diff -ruN linux-2.6.17-vanilla/sound/oss/Makefile linux-2.6.17/sound/oss/Makefile --- linux-2.6.17-vanilla/sound/oss/Makefile 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/sound/oss/Makefile 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/sound/oss/Makefile 2006-07-07 10:17:08.000000000 +0000 @@ -82,6 +82,7 @@ obj-$(CONFIG_SOUND_AD1980) += ac97_plugin_ad1980.o ac97_codec.o @@ -51836,7 +52229,7 @@ diff -ruN linux-2.6.17-vanilla/sound/oss/Makefile linux-2.6.17/sound/oss/Makefil obj-$(CONFIG_SOUND_EMU10K1) += sound.o diff -ruN linux-2.6.17-vanilla/sound/oss/sh_dac_audio.c linux-2.6.17/sound/oss/sh_dac_audio.c --- linux-2.6.17-vanilla/sound/oss/sh_dac_audio.c 2006-06-18 01:49:35.000000000 +0000 -+++ linux-2.6.17/sound/oss/sh_dac_audio.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/sound/oss/sh_dac_audio.c 2006-07-07 10:17:08.000000000 +0000 @@ -1,3 +1,14 @@ +/* + * sound/oss/sh_dac_audio.c @@ -51943,7 +52336,7 @@ diff -ruN linux-2.6.17-vanilla/sound/oss/sh_dac_audio.c linux-2.6.17/sound/oss/s } diff -ruN linux-2.6.17-vanilla/sound/oss/voyagergx_8051.c linux-2.6.17/sound/oss/voyagergx_8051.c --- linux-2.6.17-vanilla/sound/oss/voyagergx_8051.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/sound/oss/voyagergx_8051.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/sound/oss/voyagergx_8051.c 2006-07-07 10:17:08.000000000 +0000 @@ -0,0 +1,204 @@ +#include <linux/module.h> +#include <linux/delay.h> @@ -52151,7 +52544,7 @@ diff -ruN linux-2.6.17-vanilla/sound/oss/voyagergx_8051.c linux-2.6.17/sound/oss + diff -ruN linux-2.6.17-vanilla/sound/oss/voyagergx_sound.c linux-2.6.17/sound/oss/voyagergx_sound.c --- linux-2.6.17-vanilla/sound/oss/voyagergx_sound.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/sound/oss/voyagergx_sound.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/sound/oss/voyagergx_sound.c 2006-07-07 10:17:08.000000000 +0000 @@ -0,0 +1,1122 @@ +/* + * linux/drivers/sound/voyagergx_sound.c -- voyager sound driver @@ -53277,7 +53670,7 @@ diff -ruN linux-2.6.17-vanilla/sound/oss/voyagergx_sound.c linux-2.6.17/sound/os +MODULE_LICENSE("GPL"); diff -ruN linux-2.6.17-vanilla/sound/oss/voyagergx_sound.h linux-2.6.17/sound/oss/voyagergx_sound.h --- linux-2.6.17-vanilla/sound/oss/voyagergx_sound.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/sound/oss/voyagergx_sound.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/sound/oss/voyagergx_sound.h 2006-07-07 10:17:08.000000000 +0000 @@ -0,0 +1,4 @@ +#define VOYAGER_8051_COMMAND (VOYAGER_BASE + 0x000c3ff0) +#define VOYAGER_8051_STATUS (VOYAGER_BASE + 0x000c3ff2) @@ -53285,7 +53678,7 @@ diff -ruN linux-2.6.17-vanilla/sound/oss/voyagergx_sound.h linux-2.6.17/sound/os +#define VOYAGER_8051_FIFO (VOYAGER_BASE + 0x000c3600) diff -ruN linux-2.6.17-vanilla/sound/sh/CVS/Entries linux-2.6.17/sound/sh/CVS/Entries --- linux-2.6.17-vanilla/sound/sh/CVS/Entries 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/sound/sh/CVS/Entries 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/sound/sh/CVS/Entries 2006-07-07 10:17:08.000000000 +0000 @@ -0,0 +1,5 @@ +/Kconfig/1.2/Mon Jun 5 15:29:08 2006// +/Makefile/1.1/Sun Jun 4 12:13:05 2006// @@ -53294,17 +53687,17 @@ diff -ruN linux-2.6.17-vanilla/sound/sh/CVS/Entries linux-2.6.17/sound/sh/CVS/En +D diff -ruN linux-2.6.17-vanilla/sound/sh/CVS/Repository linux-2.6.17/sound/sh/CVS/Repository --- linux-2.6.17-vanilla/sound/sh/CVS/Repository 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/sound/sh/CVS/Repository 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/sound/sh/CVS/Repository 2006-07-07 10:17:08.000000000 +0000 @@ -0,0 +1 @@ +linux/sound/sh diff -ruN linux-2.6.17-vanilla/sound/sh/CVS/Root linux-2.6.17/sound/sh/CVS/Root --- linux-2.6.17-vanilla/sound/sh/CVS/Root 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/sound/sh/CVS/Root 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/sound/sh/CVS/Root 2006-07-07 10:17:08.000000000 +0000 @@ -0,0 +1 @@ +:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh diff -ruN linux-2.6.17-vanilla/sound/sh/Kconfig linux-2.6.17/sound/sh/Kconfig --- linux-2.6.17-vanilla/sound/sh/Kconfig 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/sound/sh/Kconfig 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/sound/sh/Kconfig 2006-07-07 10:17:08.000000000 +0000 @@ -0,0 +1,15 @@ +menu "SuperH devices" + depends on SND!=n && SUPERH @@ -53323,7 +53716,7 @@ diff -ruN linux-2.6.17-vanilla/sound/sh/Kconfig linux-2.6.17/sound/sh/Kconfig +endmenu diff -ruN linux-2.6.17-vanilla/sound/sh/Makefile linux-2.6.17/sound/sh/Makefile --- linux-2.6.17-vanilla/sound/sh/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/sound/sh/Makefile 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/sound/sh/Makefile 2006-07-07 10:17:08.000000000 +0000 @@ -0,0 +1,4 @@ + +snd-aica-objs := aica.o @@ -53331,7 +53724,7 @@ diff -ruN linux-2.6.17-vanilla/sound/sh/Makefile linux-2.6.17/sound/sh/Makefile + diff -ruN linux-2.6.17-vanilla/sound/sh/aica.c linux-2.6.17/sound/sh/aica.c --- linux-2.6.17-vanilla/sound/sh/aica.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/sound/sh/aica.c 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/sound/sh/aica.c 2006-07-07 10:17:08.000000000 +0000 @@ -0,0 +1,681 @@ +/* +* This code is licenced under @@ -54016,7 +54409,7 @@ diff -ruN linux-2.6.17-vanilla/sound/sh/aica.c linux-2.6.17/sound/sh/aica.c +module_exit(aica_exit); diff -ruN linux-2.6.17-vanilla/sound/sh/aica.h linux-2.6.17/sound/sh/aica.h --- linux-2.6.17-vanilla/sound/sh/aica.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.17/sound/sh/aica.h 2006-07-06 12:42:57.000000000 +0000 ++++ linux-2.6.17/sound/sh/aica.h 2006-07-07 10:17:08.000000000 +0000 @@ -0,0 +1,87 @@ +/* aica.h + * Header file for ALSA driver for diff --git a/packages/linux/linux-jlime-sh3-2.6.17/defconfig_jlime b/packages/linux/linux-jlime-sh3-2.6.17/defconfig_jlime index 6fed28dd1c..a0f2cc8c2e 100644 --- a/packages/linux/linux-jlime-sh3-2.6.17/defconfig_jlime +++ b/packages/linux/linux-jlime-sh3-2.6.17/defconfig_jlime @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.17 -# Thu Jul 6 15:38:42 2006 +# Fri Jul 7 14:14:14 2006 # CONFIG_SUPERH=y CONFIG_RWSEM_GENERIC_SPINLOCK=y @@ -58,7 +58,7 @@ CONFIG_BASE_SMALL=0 CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y +# CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set CONFIG_KMOD=y @@ -290,15 +290,21 @@ CONFIG_PACKET=y CONFIG_PACKET_MMAP=y CONFIG_UNIX=y CONFIG_XFRM=y -# CONFIG_XFRM_USER is not set +CONFIG_XFRM_USER=y CONFIG_NET_KEY=y CONFIG_INET=y -# CONFIG_IP_MULTICAST is not set -# CONFIG_IP_ADVANCED_ROUTER is not set +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_ASK_IP_FIB_HASH=y +# CONFIG_IP_FIB_TRIE is not set CONFIG_IP_FIB_HASH=y +CONFIG_IP_MULTIPLE_TABLES=y +# CONFIG_IP_ROUTE_MULTIPATH is not set +# CONFIG_IP_ROUTE_VERBOSE is not set # CONFIG_IP_PNP is not set # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE is not set +# CONFIG_IP_MROUTE is not set # CONFIG_ARPD is not set # CONFIG_SYN_COOKIES is not set # CONFIG_INET_AH is not set @@ -310,15 +316,9 @@ CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_BIC=y -CONFIG_IPV6=y -# CONFIG_IPV6_PRIVACY is not set -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_INET6_AH is not set -# CONFIG_INET6_ESP is not set -# CONFIG_INET6_IPCOMP is not set +# CONFIG_IPV6 is not set # CONFIG_INET6_XFRM_TUNNEL is not set # CONFIG_INET6_TUNNEL is not set -# CONFIG_IPV6_TUNNEL is not set # CONFIG_NETFILTER is not set # @@ -600,8 +600,8 @@ CONFIG_NET_RADIO=y # Obsolete Wireless cards support (pre-802.11) # # CONFIG_STRIP is not set -# CONFIG_ARLAN is not set -# CONFIG_WAVELAN is not set +CONFIG_ARLAN=m +CONFIG_WAVELAN=m CONFIG_PCMCIA_WAVELAN=m CONFIG_PCMCIA_NETWAVE=m @@ -783,7 +783,38 @@ CONFIG_LEGACY_PTY_COUNT=8 # # I2C support # -# CONFIG_I2C is not set +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y + +# +# I2C Algorithms +# +# CONFIG_I2C_ALGOBIT is not set +# CONFIG_I2C_ALGOPCF is not set +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# +# CONFIG_I2C_ELEKTOR is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_PCA_ISA is not set + +# +# Miscellaneous I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_DS1374 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCA9539 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_MAX6875 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set # # SPI support @@ -801,7 +832,39 @@ CONFIG_LEGACY_PTY_COUNT=8 # CONFIG_HWMON=y # CONFIG_HWMON_VID is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ASB100 is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_DS1621 is not set # CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_FSCHER is not set +# CONFIG_SENSORS_FSCPOS is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set # CONFIG_HWMON_DEBUG_CHIP is not set # @@ -876,6 +939,7 @@ CONFIG_SOUND=y CONFIG_SOUND_PRIME=y # CONFIG_SOUND_MSNDCLAS is not set # CONFIG_SOUND_MSNDPIN is not set +# CONFIG_SOUND_TVMIXER is not set CONFIG_SOUND_SH_DAC_AUDIO=y CONFIG_SOUND_SH_DAC_AUDIO_CHANNEL=1 @@ -972,7 +1036,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_SYSFS=y -# CONFIG_TMPFS is not set +CONFIG_TMPFS=y # CONFIG_HUGETLBFS is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y @@ -1099,7 +1163,7 @@ CONFIG_LOG_BUF_SHIFT=14 # Cryptographic options # CONFIG_CRYPTO=y -# CONFIG_CRYPTO_HMAC is not set +CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=m diff --git a/packages/meta/slugos-native.bb b/packages/meta/slugos-native.bb index 6a19601834..e40116d292 100644 --- a/packages/meta/slugos-native.bb +++ b/packages/meta/slugos-native.bb @@ -5,13 +5,14 @@ # DESCRIPTION = "Packages that are required for the SlugOS native build environment" LICENSE = "MIT" -PR = "r1" +PR = "r3" INHIBIT_DEFAULT_DEPS = "1" EXCLUDE_FROM_WORLD = "1" ALLOW_EMPTY = "1" PACKAGES = "${PN}" PROVIDES += "${SLUGOS_IMAGENAME}-native" +DEPENDS = "libc6-dev" # Run-time only (RDEPENDS) stuff - no package explicitly provides # these targets. diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 4a04c945ae..f729c7f22b 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" MAINTAINER = "NSLU2 Linux <nslu2-linux@yahoogroups.com>" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r5" +PR = "r6" CONFLICTS = "db3" PROVIDES += "${SLUGOS_IMAGENAME}-packages" @@ -72,6 +72,7 @@ SLUGOS_PACKAGES = "\ grep \ gtk-doc \ gzip \ + hdparm \ icecast \ ifupdown \ ipkg-utils \ @@ -94,6 +95,7 @@ SLUGOS_PACKAGES = "\ libusb \ libvorbis \ libxml2 \ + lirc \ lrzsz \ lsof \ lvm2 \ diff --git a/packages/meta/task-python-everything_20060425.bb b/packages/meta/task-python-everything_20060425.bb index 738b823d7b..213ed0f825 100644 --- a/packages/meta/task-python-everything_20060425.bb +++ b/packages/meta/task-python-everything_20060425.bb @@ -2,7 +2,7 @@ DESCRIPTION= "Everything Python" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" HOMEPAGE = "http://www.vanille.de/projects/python.spy" LICENSE = "MIT" -PR = "ml7" +PR = "ml8" BROKEN_BECAUSE_GCC4 = "\ python-egenix-mx-base" @@ -68,6 +68,7 @@ RDEPENDS = "\ python-urwid \ python-vmaps \ python-vorbis \ + python-webpy \ moin \ plone \ twisted \ diff --git a/packages/meta/task-python-sharprom_20060425.bb b/packages/meta/task-python-sharprom_20060425.bb index 8ce0dcf855..49841274ff 100644 --- a/packages/meta/task-python-sharprom_20060425.bb +++ b/packages/meta/task-python-sharprom_20060425.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Everything Python for SharpROM" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" HOMEPAGE = "http://www.vanille.de/projects/python.spy" LICENSE = "MIT" -PR = "ml4" +PR = "ml5" NONWORKING = "\ python-codes \ @@ -63,6 +63,7 @@ RDEPENDS = "\ python-tlslite \ python-urwid \ python-vmaps \ + python-webpy \ moin \ plone \ twisted \ diff --git a/packages/moc/.mtn2git_empty b/packages/moc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/moc/.mtn2git_empty diff --git a/packages/moc/moc_2.4.0.bb b/packages/moc/moc_2.4.0.bb new file mode 100644 index 0000000000..cb9cf6d7db --- /dev/null +++ b/packages/moc/moc_2.4.0.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "MOC is a ncurses based music player" +MAINTAINER = "Kristoffer Ericson <kristoffer@jlime.com>" +SECTION = "console/multimedia" +DEPENDS = "ncurses" +LICENSE = "GPL" +AUTHOR = "Damian Pietras <daper@daper.net>" +HOMEPAGE = "http://moc.daper.net/" + +SRC_URI = "ftp://ftp.daper.net/pub/soft/moc/stable/${PN}-${PV}.tar.bz2" + +inherit autotools + +FILES_${PN} = "${bindir}/moc" diff --git a/packages/python/python-2.4.3-manifest.inc b/packages/python/python-2.4.3-manifest.inc index abc6278e04..43d646dae4 100644 --- a/packages/python/python-2.4.3-manifest.inc +++ b/packages/python/python-2.4.3-manifest.inc @@ -1,5 +1,5 @@ ######################################################################################################################## -### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Wed May 10 13:57:16 2006 +### AUTO-GENERATED by './generate-oe.py' [(C) 2002-2005 Michael 'Mickey' Lauer <mickey@Vanille.de>] on Sat Jul 8 12:48:43 2006 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -8,6 +8,8 @@ ######################################################################################################################## +PROVIDES+="python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " + PACKAGES="python-threading python-distutils python-textutils python-codecs python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-resource python-devel python-math python-hotshot python-unixadmin python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-syslog python-html python-readline python-pydoc python-logging python-mailbox python-xml python-mime python-tests python-unittest python-stringold python-lib-old-and-deprecated python-compile python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " DESCRIPTION_python-threading="Python Threading & Synchronization Support" diff --git a/packages/python/python-pyro/pyro-unattended-install.patch b/packages/python/python-pyro/pyro-unattended-install.patch index aefabacbf0..4a14ef2310 100644 --- a/packages/python/python-pyro/pyro-unattended-install.patch +++ b/packages/python/python-pyro/pyro-unattended-install.patch @@ -13,4 +13,4 @@ [install] optimize=1 -#install-scripts=/foo/bar -+install-scripts= ../image/usr/lib/python2.3 ++install-scripts= ../image/usr/lib/python2.4 diff --git a/packages/python/python-pyro_3.4.bb b/packages/python/python-pyro_3.4.bb index a8ac4bb609..4509e9c07b 100644 --- a/packages/python/python-pyro_3.4.bb +++ b/packages/python/python-pyro_3.4.bb @@ -10,9 +10,9 @@ LICENSE = "MIT" RDEPENDS = "python-core python-crypt python-io python-lang python-math \ python-netserver python-pickle python-re python-shell python-stringold \ python-threading" -PR = "r1" +PR = "r2" -SRC_URI = "cvs://anonymous:@cvs.sourceforge.net/cvsroot/pyro;module=Pyro;method=pserver;tag=pyro3_4 \ +SRC_URI = "cvs://anonymous:@pyro.cvs.sourceforge.net/cvsroot/pyro;module=Pyro;method=pserver;tag=pyro3_4 \ file://pyro-unattended-install.patch;patch=1;pnum=0" S="${WORKDIR}/Pyro" diff --git a/packages/python/python-webpy/.mtn2git_empty b/packages/python/python-webpy/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/python/python-webpy/.mtn2git_empty diff --git a/packages/python/python-webpy/web.py b/packages/python/python-webpy/web.py new file mode 100644 index 0000000000..2761fa30a0 --- /dev/null +++ b/packages/python/python-webpy/web.py @@ -0,0 +1,2349 @@ +#!/usr/bin/env python +"""web.py: makes web apps (http://webpy.org)""" +__version__ = "0.1381" +__revision__ = "$Rev: 72 $" +__license__ = "public domain" +__author__ = "Aaron Swartz <me@aaronsw.com>" +__contributors__ = "see http://webpy.org/changes" + +from __future__ import generators + +# long term todo: +# - new form system +# - new templating system +# - unit tests? + +# todo: +# - get rid of upvars +# - break up into separate files +# - provide an option to use .write() +# - allow people to do $self.id from inside a reparam +# - add sqlite support +# - convert datetimes, floats in WebSafe +# - locks around memoize +# - fix memoize to use cacheify style techniques +# - merge curval query with the insert +# - figure out how to handle squid, etc. for web.ctx.ip + +import os, os.path, sys, time, types, traceback, threading +import cgi, re, urllib, urlparse, Cookie, pprint +from threading import currentThread +from tokenize import tokenprog +iters = (list, tuple) +if hasattr(__builtins__, 'set') or ( + hasattr(__builtins__, 'has_key') and __builtins__.has_key('set')): + iters += (set,) +try: + from sets import Set + iters += (Set,) +except ImportError: + pass +try: + import datetime, itertools +except ImportError: + pass +try: + from Cheetah.Compiler import Compiler + from Cheetah.Filters import Filter + _hasTemplating = True +except ImportError: + _hasTemplating = False + +try: + from DBUtils.PooledDB import PooledDB + _hasPooling = True +except ImportError: + _hasPooling = False + +# hack for compatibility with Python 2.3: +if not hasattr(traceback, 'format_exc'): + from cStringIO import StringIO + def format_exc(limit=None): + strbuf = StringIO() + traceback.print_exc(limit, strbuf) + return strbuf.getvalue() + traceback.format_exc = format_exc + +## General Utilities + +def _strips(direction, text, remove): + if direction == 'l': + if text.startswith(remove): + return text[len(remove):] + elif direction == 'r': + if text.endswith(remove): + return text[:-len(remove)] + else: + raise ValueError, "Direction needs to be r or l." + return text + +def rstrips(text, remove): + """removes the string `remove` from the right of `text`""" + return _strips('r', text, remove) + +def lstrips(text, remove): + """removes the string `remove` from the left of `text`""" + return _strips('l', text, remove) + +def strips(text, remove): + """removes the string `remove` from the both sides of `text`""" + return rstrips(lstrips(text, remove), remove) + +def autoassign(self, locals): + """ + Automatically assigns local variables to `self`. + Generally used in `__init__` methods, as in: + + def __init__(self, foo, bar, baz=1): autoassign(self, locals()) + """ + #locals = sys._getframe(1).f_locals + #self = locals['self'] + for (key, value) in locals.iteritems(): + if key == 'self': + continue + setattr(self, key, value) + +class Storage(dict): + """ + A Storage object is like a dictionary except `obj.foo` can be used + instead of `obj['foo']`. Create one by doing `storage({'a':1})`. + """ + def __getattr__(self, key): + if self.has_key(key): + return self[key] + raise AttributeError, repr(key) + def __setattr__(self, key, value): + self[key] = value + def __repr__(self): + return '<Storage ' + dict.__repr__(self) + '>' + +storage = Storage + +def storify(mapping, *requireds, **defaults): + """ + Creates a `storage` object from dictionary `mapping`, raising `KeyError` if + d doesn't have all of the keys in `requireds` and using the default + values for keys found in `defaults`. + + For example, `storify({'a':1, 'c':3}, b=2, c=0)` will return the equivalent of + `storage({'a':1, 'b':2, 'c':3})`. + + If a `storify` value is a list (e.g. multiple values in a form submission), + `storify` returns the last element of the list, unless the key appears in + `defaults` as a list. Thus: + + >>> storify({'a':[1, 2]}).a + 2 + >>> storify({'a':[1, 2]}, a=[]).a + [1, 2] + >>> storify({'a':1}, a=[]).a + [1] + >>> storify({}, a=[]).a + [] + + Similarly, if the value has a `value` attribute, `storify will return _its_ + value, unless the key appears in `defaults` as a dictionary. + + >>> storify({'a':storage(value=1)}).a + 1 + >>> storify({'a':storage(value=1)}, a={}).a + <Storage {'value': 1}> + >>> storify({}, a={}).a + {} + + """ + def getvalue(x): + if hasattr(x, 'value'): + return x.value + else: + return x + + stor = Storage() + for key in requireds + tuple(mapping.keys()): + value = mapping[key] + if isinstance(value, list): + if isinstance(defaults.get(key), list): + value = [getvalue(x) for x in value] + else: + value = value[-1] + if not isinstance(defaults.get(key), dict): + value = getvalue(value) + if isinstance(defaults.get(key), list) and not isinstance(value, list): + value = [value] + setattr(stor, key, value) + + for (key, value) in defaults.iteritems(): + result = value + if hasattr(stor, key): + result = stor[key] + if value == () and not isinstance(result, tuple): + result = (result,) + setattr(stor, key, result) + + return stor + +class Memoize: + """ + 'Memoizes' a function, caching its return values for each input. + """ + def __init__(self, func): + self.func = func + self.cache = {} + def __call__(self, *args, **keywords): + key = (args, tuple(keywords.items())) + if key not in self.cache: + self.cache[key] = self.func(*args, **keywords) + return self.cache[key] +memoize = Memoize + +re_compile = memoize(re.compile) #@@ threadsafe? +re_compile.__doc__ = """ +A memoized version of re.compile. +""" + +class _re_subm_proxy: + def __init__(self): + self.match = None + def __call__(self, match): + self.match = match + return '' + +def re_subm(pat, repl, string): + """Like re.sub, but returns the replacement _and_ the match object.""" + compiled_pat = re_compile(pat) + proxy = _re_subm_proxy() + compiled_pat.sub(proxy.__call__, string) + return compiled_pat.sub(repl, string), proxy.match + +def group(seq, size): + """ + Returns an iterator over a series of lists of length size from iterable. + + For example, `list(group([1,2,3,4], 2))` returns `[[1,2],[3,4]]`. + """ + if not hasattr(seq, 'next'): + seq = iter(seq) + while True: + yield [seq.next() for i in xrange(size)] + +class IterBetter: + """ + Returns an object that can be used as an iterator + but can also be used via __getitem__ (although it + cannot go backwards -- that is, you cannot request + `iterbetter[0]` after requesting `iterbetter[1]`). + """ + def __init__(self, iterator): + self.i, self.c = iterator, 0 + def __iter__(self): + while 1: + yield self.i.next() + self.c += 1 + def __getitem__(self, i): + #todo: slices + if i > self.c: + raise IndexError, "already passed "+str(i) + try: + while i < self.c: + self.i.next() + self.c += 1 + # now self.c == i + self.c += 1 + return self.i.next() + except StopIteration: + raise IndexError, str(i) +iterbetter = IterBetter + +def dictreverse(mapping): + """Takes a dictionary like `{1:2, 3:4}` and returns `{2:1, 4:3}`.""" + return dict([(value, key) for (key, value) in mapping.iteritems()]) + +def dictfind(dictionary, element): + """ + Returns a key whose value in `dictionary` is `element` + or, if none exists, None. + """ + for (key, value) in dictionary.iteritems(): + if element is value: + return key + +def dictfindall(dictionary, element): + """ + Returns the keys whose values in `dictionary` are `element` + or, if none exists, []. + """ + res = [] + for (key, value) in dictionary.iteritems(): + if element is value: + res.append(key) + return res + +def dictincr(dictionary, element): + """ + Increments `element` in `dictionary`, + setting it to one if it doesn't exist. + """ + dictionary.setdefault(element, 0) + dictionary[element] += 1 + return dictionary[element] + +def dictadd(dict_a, dict_b): + """ + Returns a dictionary consisting of the keys in `a` and `b`. + If they share a key, the value from b is used. + """ + result = {} + result.update(dict_a) + result.update(dict_b) + return result + +sumdicts = dictadd # deprecated + +def listget(lst, ind, default=None): + """Returns `lst[ind]` if it exists, `default` otherwise.""" + if len(lst)-1 < ind: + return default + return lst[ind] + +def intget(integer, default=None): + """Returns `integer` as an int or `default` if it can't.""" + try: + return int(integer) + except (TypeError, ValueError): + return default + +def datestr(then, now=None): + """Converts a (UTC) datetime object to a nice string representation.""" + def agohence(n, what, divisor=None): + if divisor: n = n // divisor + + out = str(abs(n)) + ' ' + what # '2 day' + if abs(n) != 1: out += 's' # '2 days' + out += ' ' # '2 days ' + if n < 0: + out += 'from now' + else: + out += 'ago' + return out # '2 days ago' + + oneday = 24 * 60 * 60 + + if not now: now = datetime.datetime.utcnow() + delta = now - then + deltaseconds = int(delta.days * oneday + delta.seconds + delta.microseconds * 1e-06) + deltadays = abs(deltaseconds) // oneday + if deltaseconds < 0: deltadays *= -1 # fix for oddity of floor + + if deltadays: + if abs(deltadays) < 4: + return agohence(deltadays, 'day') + + out = then.strftime('%B %e') # e.g. 'June 13' + if then.year != now.year or deltadays < 0: + out += ', %s' % then.year + return out + + if int(deltaseconds): + if abs(deltaseconds) > (60 * 60): + return agohence(deltaseconds, 'hour', 60 * 60) + elif abs(deltaseconds) > 60: + return agohence(deltaseconds, 'minute', 60) + else: + return agohence(deltaseconds, 'second') + + deltamicroseconds = delta.microseconds + if delta.days: deltamicroseconds = int(delta.microseconds - 1e6) # datetime oddity + if abs(deltamicroseconds) > 1000: + return agohence(deltamicroseconds, 'millisecond', 1000) + + return agohence(deltamicroseconds, 'microsecond') + +def upvars(level=2): + """Guido van Rossum doesn't want you to use this function.""" + return dictadd( + sys._getframe(level).f_globals, + sys._getframe(level).f_locals) + +class CaptureStdout: + """ + Captures everything func prints to stdout and returns it instead. + + **WARNING:** Not threadsafe! + """ + def __init__(self, func): + self.func = func + def __call__(self, *args, **keywords): + from cStringIO import StringIO + # Not threadsafe! + out = StringIO() + oldstdout = sys.stdout + sys.stdout = out + try: + self.func(*args, **keywords) + finally: + sys.stdout = oldstdout + return out.getvalue() +capturestdout = CaptureStdout + +class Profile: + """ + Profiles `func` and returns a tuple containing its output + and a string with human-readable profiling information. + """ + def __init__(self, func): + self.func = func + def __call__(self, *args): ##, **kw): kw unused + import hotshot, hotshot.stats, tempfile ##, time already imported + temp = tempfile.NamedTemporaryFile() + prof = hotshot.Profile(temp.name) + + stime = time.time() + result = prof.runcall(self.func, *args) + stime = time.time() - stime + + prof.close() + stats = hotshot.stats.load(temp.name) + stats.strip_dirs() + stats.sort_stats('time', 'calls') + x = '\n\ntook '+ str(stime) + ' seconds\n' + x += capturestdout(stats.print_stats)(40) + x += capturestdout(stats.print_callers)() + return result, x +profile = Profile + +def tryall(context, prefix=None): + """ + Tries a series of functions and prints their results. + `context` is a dictionary mapping names to values; + the value will only be tried if it's callable. + + For example, you might have a file `test/stuff.py` + with a series of functions testing various things in it. + At the bottom, have a line: + + if __name__ == "__main__": tryall(globals()) + + Then you can run `python test/stuff.py` and get the results of + all the tests. + """ + context = context.copy() # vars() would update + results = {} + for (key, value) in context.iteritems(): + if not hasattr(value, '__call__'): + continue + if prefix and not key.startswith(prefix): + continue + print key + ':', + try: + r = value() + dictincr(results, r) + print r + except: + print 'ERROR' + dictincr(results, 'ERROR') + print ' ' + '\n '.join(traceback.format_exc().split('\n')) + + print '-'*40 + print 'results:' + for (key, value) in results.iteritems(): + print ' '*2, str(key)+':', value + +class ThreadedDict: + """ + Takes a dictionary that maps threads to objects. + When a thread tries to get or set an attribute or item + of the threadeddict, it passes it on to the object + for that thread in dictionary. + """ + def __init__(self, dictionary): + self.__dict__['_ThreadedDict__d'] = dictionary + def __getattr__(self, attr): + return getattr(self.__d[currentThread()], attr) + def __getitem__(self, item): + return self.__d[currentThread()][item] + def __setattr__(self, attr, value): + if attr == '__doc__': + self.__dict__[attr] = value + else: + return setattr(self.__d[currentThread()], attr, value) + def __setitem__(self, item, value): + self.__d[currentThread()][item] = value + def __hash__(self): + return hash(self.__d[currentThread()]) +threadeddict = ThreadedDict + +## IP Utilities + +def validipaddr(address): + """returns True if `address` is a valid IPv4 address""" + try: + octets = address.split('.') + assert len(octets) == 4 + for x in octets: + assert 0 <= int(x) <= 255 + except (AssertionError, ValueError): + return False + return True + +def validipport(port): + """returns True if `port` is a valid IPv4 port""" + try: + assert 0 <= int(port) <= 65535 + except (AssertionError, ValueError): + return False + return True + +def validip(ip, defaultaddr="0.0.0.0", defaultport=8080): + """returns `(ip_address, port)` from string `ip_addr_port`""" + addr = defaultaddr + port = defaultport + + ip = ip.split(":", 1) + if len(ip) == 1: + if not ip[0]: + pass + elif validipaddr(ip[0]): + addr = ip[0] + elif validipport(ip[0]): + port = int(ip[0]) + else: + raise ValueError, ':'.join(ip) + ' is not a valid IP address/port' + elif len(ip) == 2: + addr, port = ip + if not validipaddr(addr) and validipport(port): + raise ValueError, ':'.join(ip) + ' is not a valid IP address/port' + port = int(port) + else: + raise ValueError, ':'.join(ip) + ' is not a valid IP address/port' + return (addr, port) + +def validaddr(string_): + """returns either (ip_address, port) or "/path/to/socket" from string_""" + if '/' in string_: + return string_ + else: + return validip(string_) + +## URL Utilities + +def prefixurl(base=''): + """ + Sorry, this function is really difficult to explain. + Maybe some other time. + """ + url = ctx.path.lstrip('/') + for i in xrange(url.count('/')): + base += '../' + if not base: + base = './' + return base + +def urlquote(x): return urllib.quote(websafe(x).encode('utf-8')) + +## Formatting + +try: + from markdown import markdown # http://webpy.org/markdown.py +except ImportError: + pass + +r_url = re_compile('(?<!\()(http://(\S+))') +def safemarkdown(text): + """ + Converts text to HTML following the rules of Markdown, but blocking any + outside HTML input, so that only the things supported by Markdown + can be used. Also converts raw URLs to links. + + (requires [markdown.py](http://webpy.org/markdown.py)) + """ + if text: + text = text.replace('<', '<') + # TODO: automatically get page title? + text = r_url.sub(r'<\1>', text) + text = markdown(text) + return text + +## Databases + +class _ItplError(ValueError): + """String Interpolation Error + from <http://lfw.org/python/Itpl.py> + (cf. below for license) + """ + def __init__(self, text, pos): + ValueError.__init__(self) + self.text = text + self.pos = pos + def __str__(self): + return "unfinished expression in %s at char %d" % ( + repr(self.text), self.pos) + +def _interpolate(format): + """ + Takes a format string and returns a list of 2-tuples of the form + (boolean, string) where boolean says whether string should be evaled + or not. + + from <http://lfw.org/python/Itpl.py> (public domain, Ka-Ping Yee) + """ + def matchorfail(text, pos): + match = tokenprog.match(text, pos) + if match is None: + raise _ItplError(text, pos) + return match, match.end() + + namechars = "abcdefghijklmnopqrstuvwxyz" \ + "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_"; + chunks = [] + pos = 0 + + while 1: + dollar = format.find("$", pos) + if dollar < 0: + break + nextchar = format[dollar + 1] + + if nextchar == "{": + chunks.append((0, format[pos:dollar])) + pos, level = dollar + 2, 1 + while level: + match, pos = matchorfail(format, pos) + tstart, tend = match.regs[3] + token = format[tstart:tend] + if token == "{": + level = level + 1 + elif token == "}": + level = level - 1 + chunks.append((1, format[dollar + 2:pos - 1])) + + elif nextchar in namechars: + chunks.append((0, format[pos:dollar])) + match, pos = matchorfail(format, dollar + 1) + while pos < len(format): + if format[pos] == "." and \ + pos + 1 < len(format) and format[pos + 1] in namechars: + match, pos = matchorfail(format, pos + 1) + elif format[pos] in "([": + pos, level = pos + 1, 1 + while level: + match, pos = matchorfail(format, pos) + tstart, tend = match.regs[3] + token = format[tstart:tend] + if token[0] in "([": + level = level + 1 + elif token[0] in ")]": + level = level - 1 + else: + break + chunks.append((1, format[dollar + 1:pos])) + + else: + chunks.append((0, format[pos:dollar + 1])) + pos = dollar + 1 + (nextchar == "$") + + if pos < len(format): + chunks.append((0, format[pos:])) + return chunks + +def sqlors(left, lst): + """ + `left is a SQL clause like `tablename.arg = ` + and `lst` is a list of values. Returns a reparam-style + pair featuring the SQL that ORs together the clause + for each item in the lst. + + For example: + + web.sqlors('foo =', [1,2,3]) + + would result in: + + foo = 1 OR foo = 2 OR foo = 3 + """ + if isinstance(lst, iters): + lst = list(lst) + ln = len(lst) + if ln == 0: + return ("2+2=5", []) + if ln == 1: + lst = lst[0] + + if isinstance(lst, iters): + return '(' + left + \ + (' OR ' + left).join([aparam() for param in lst]) + ")", lst + else: + return left + aparam(), [lst] + +class UnknownParamstyle(Exception): + """raised for unsupported db paramstyles + + Currently supported: qmark,numeric, format, pyformat + """ + pass + +def aparam(): + """Use in a SQL string to make a spot for a db value.""" + style = ctx.db_module.paramstyle + if style == 'qmark': + return '?' + elif style == 'numeric': + return ':1' + elif style in ['format', 'pyformat']: + return '%s' + raise UnknownParamstyle, style + +def reparam(string_, dictionary): + """ + Takes a string and a dictionary and interpolates the string + using values from the dictionary. Returns a 2-tuple containing + the a string with `aparam()`s in it and a list of the matching values. + + You can pass this sort of thing as a clause in any db function. + Otherwise, you can pass a dictionary to the keyword argument `vars` + and the function will call reparam for you. + """ + vals = [] + result = [] + for live, chunk in _interpolate(string_): + if live: + result.append(aparam()) + vals.append(eval(chunk, dictionary)) + else: result.append(chunk) + return ''.join(result), vals + +class UnknownDB(Exception): + """raised for unsupported dbms""" + pass +def connect(dbn, **keywords): + """ + Connects to the specified database. + db currently must be "postgres" or "mysql". + If DBUtils is installed, connection pooling will be used. + """ + if dbn == "postgres": + try: + import psycopg2 as db + except ImportError: + try: + import psycopg as db + except ImportError: + import pgdb as db + keywords['password'] = keywords['pw'] + del keywords['pw'] + keywords['database'] = keywords['db'] + del keywords['db'] + elif dbn == "mysql": + import MySQLdb as db + keywords['passwd'] = keywords['pw'] + del keywords['pw'] + db.paramstyle = 'pyformat' # it's both, like psycopg + elif dbn == "sqlite": + try: ## try first sqlite3 version + from pysqlite2 import dbapi2 as db + db.paramstyle = 'qmark' + except ImportError: ## else try sqlite2 + import sqlite as db + keywords['database'] = keywords['db'] + del keywords['db'] + else: + raise UnknownDB, dbn + ctx.db_name = dbn + ctx.db_module = db + ctx.db_transaction = False + if _hasPooling: + if 'db' not in globals(): + globals()['db'] = PooledDB(dbapi=db, **keywords) + ctx.db = globals()['db'].connection() + else: + ctx.db = db.connect(**keywords) + ctx.dbq_count = 0 + if globals().get('db_printing'): + def db_execute(cur, sql_query, d=None): + """executes an sql query""" + + def sqlquote(obj): + """converts `obj` to its proper SQL version""" + + # because `1 == True and hash(1) == hash(True)` + # we have to do this the hard way... + + if obj is None: + return 'NULL' + elif obj is True: + return "'t'" + elif obj is False: + return "'f'" + elif isinstance(obj, datetime.datetime): + return repr(obj.isoformat()) + else: + return repr(obj) + + ctx.dbq_count += 1 + try: + outq = sql_query % tuple(map(sqlquote, d)) + except TypeError: + outq = sql_query + print >> debug, str(ctx.dbq_count)+':', outq + a = time.time() + out = cur.execute(sql_query, d) + b = time.time() + print >> debug, '(%s)' % round(b - a, 2) + return out + ctx.db_execute = db_execute + else: + ctx.db_execute = lambda cur, sql_query, d=None: \ + cur.execute(sql_query, d) + return ctx.db + +def transact(): + """Start a transaction.""" + # commit everything up to now, so we don't rollback it later + ctx.db.commit() + ctx.db_transaction = True + +def commit(): + """Commits a transaction.""" + ctx.db.commit() + ctx.db_transaction = False + +def rollback(): + """Rolls back a transaction.""" + ctx.db.rollback() + ctx.db_transaction = False + +def query(sql_query, vars=None, processed=False): + """ + Execute SQL query `sql_query` using dictionary `vars` to interpolate it. + If `processed=True`, `vars` is a `reparam`-style list to use + instead of interpolating. + """ + if vars is None: + vars = {} + db_cursor = ctx.db.cursor() + + if not processed: + sql_query, vars = reparam(sql_query, vars) + ctx.db_execute(db_cursor, sql_query, vars) + if db_cursor.description: + names = [x[0] for x in db_cursor.description] + def iterwrapper(): + row = db_cursor.fetchone() + while row: + yield Storage(dict(zip(names, row))) + row = db_cursor.fetchone() + out = iterbetter(iterwrapper()) + out.__len__ = lambda: int(db_cursor.rowcount) + out.list = lambda: [Storage(dict(zip(names, x))) \ + for x in db_cursor.fetchall()] + else: + out = db_cursor.rowcount + + if not ctx.db_transaction: + ctx.db.commit() + return out + +def sqllist(lst): + """ + If a list, converts it to a comma-separated string. + Otherwise, returns the string. + """ + if isinstance(lst, str): + return lst + else: return ', '.join(lst) + +def sqlwhere(dictionary): + """ + Converts a `dictionary` to an SQL WHERE clause in + `reparam` format. Thus, + + {'cust_id': 2, 'order_id':3} + + would result in the equivalent of: + + 'cust_id = 2 AND order_id = 3' + + but properly quoted. + """ + + return ' AND '.join([ + '%s = %s' % (k, aparam()) for k in dictionary.keys() + ]), dictionary.values() + +def select(tables, vars=None, what='*', where=None, order=None, group=None, + limit=None, offset=None): + """ + Selects `what` from `tables` with clauses `where`, `order`, + `group`, `limit`, and `offset. Uses vars to interpolate. + Otherwise, each clause can take a reparam-style list. + """ + if vars is None: + vars = {} + values = [] + qout = "" + + for (sql, val) in ( + ('SELECT', what), + ('FROM', sqllist(tables)), + ('WHERE', where), + ('GROUP BY', group), + ('ORDER BY', order), + ('LIMIT', limit), + ('OFFSET', offset)): + if isinstance(val, (int, long)): + if sql == 'WHERE': + nquery, nvalue = 'id = '+aparam(), [val] + else: + nquery, nvalue = str(val), () + elif isinstance(val, (list, tuple)) and len(val) == 2: + nquery, nvalue = val + elif val: + nquery, nvalue = reparam(val, vars) + else: + continue + qout += " " + sql + " " + nquery + values.extend(nvalue) + return query(qout, values, processed=True) + +def insert(tablename, seqname=None, **values): + """ + Inserts `values` into `tablename`. Returns current sequence ID. + Set `seqname` to the ID if it's not the default, or to `False` + if there isn't one. + """ + db_cursor = ctx.db.cursor() + + if values: + sql_query, v = "INSERT INTO %s (%s) VALUES (%s)" % ( + tablename, + ", ".join(values.keys()), + ', '.join([aparam() for x in values]) + ), values.values() + else: + sql_query, v = "INSERT INTO %s DEFAULT VALUES" % tablename, None + + if seqname is False: + pass + elif ctx.db_name == "postgres": + if seqname is None: + seqname = tablename + "_id_seq" + sql_query += "; SELECT currval('%s')" % seqname + elif ctx.db_name == "mysql": + ctx.db_execute(db_cursor, sql_query, v) + sql_query = "SELECT last_insert_id()" + v = () + elif ctx.db_name == "sqlite": + ctx.db_execute(db_cursor, sql_query, v) + # not really the same... + sql_query = "SELECT last_insert_rowid()" + v = () + + ctx.db_execute(db_cursor, sql_query, v) + try: + out = db_cursor.fetchone()[0] + except Exception: + out = None + + if not ctx.db_transaction: + ctx.db.commit() + + return out + +def update(tables, where, vars=None, **values): + """ + Update `tables` with clause `where` (interpolated using `vars`) + and setting `values`. + """ + if vars is None: + vars = {} + if isinstance(where, (int, long)): + vars = [where] + where = "id = " + aparam() + elif isinstance(where, (list, tuple)) and len(where) == 2: + where, vars = where + else: + where, vars = reparam(where, vars) + + db_cursor = ctx.db.cursor() + ctx.db_execute(db_cursor, "UPDATE %s SET %s WHERE %s" % ( + sqllist(tables), + ', '.join([k + '=' + aparam() for k in values.keys()]), + where), + values.values() + vars) + + if not ctx.db_transaction: + ctx.db.commit() + return db_cursor.rowcount + +def delete(table, where, using=None, vars=None): + """ + Deletes from `table` with clauses `where` and `using`. + """ + if vars is None: + vars = {} + db_cursor = ctx.db.cursor() + + if isinstance(where, (int, long)): + vars = [where] + where = "id = " + aparam() + elif isinstance(where, (list, tuple)) and len(where) == 2: + where, vars = where + else: + where, vars = reparam(where, vars) + q = 'DELETE FROM %s WHERE %s' % (table, where) + if using: + q += ' USING ' + sqllist(using) + ctx.db_execute(db_cursor, q, vars) + + if not ctx.db_transaction: + ctx.db.commit() + return db_cursor.rowcount + +## Request Handlers + +def handle(mapping, fvars=None): + """ + Call the appropriate function based on the url to function mapping in `mapping`. + If no module for the function is specified, look up the function in `fvars`. If + `fvars` is empty, using the caller's context. + + `mapping` should be a tuple of paired regular expressions with function name + substitutions. `handle` will import modules as necessary. + """ + for url, ofno in group(mapping, 2): + if isinstance(ofno, tuple): + ofn, fna = ofno[0], list(ofno[1:]) + else: + ofn, fna = ofno, [] + fn, result = re_subm('^' + url + '$', ofn, ctx.path) + if result: # it's a match + if fn.split(' ', 1)[0] == "redirect": + url = fn.split(' ', 1)[1] + if ctx.method == "GET": + x = ctx.env.get('QUERY_STRING', '') + if x: + url += '?' + x + return redirect(url) + elif '.' in fn: + x = fn.split('.') + mod, cls = '.'.join(x[:-1]), x[-1] + mod = __import__(mod, globals(), locals(), [""]) + cls = getattr(mod, cls) + else: + cls = fn + mod = fvars or upvars() + if isinstance(mod, types.ModuleType): + mod = vars(mod) + try: + cls = mod[cls] + except KeyError: + return notfound() + + meth = ctx.method + if meth == "HEAD": + if not hasattr(cls, meth): + meth = "GET" + if not hasattr(cls, meth): + return nomethod(cls) + tocall = getattr(cls(), meth) + args = list(result.groups()) + for d in re.findall(r'\\(\d+)', ofn): + args.pop(int(d) - 1) + return tocall(*([urllib.unquote(x) for x in args] + fna)) + + return notfound() + +def autodelegate(prefix=''): + """ + Returns a method that takes one argument and calls the method named prefix+arg, + calling `notfound()` if there isn't one. Example: + + urls = ('/prefs/(.*)', 'prefs') + + class prefs: + GET = autodelegate('GET_') + def GET_password(self): pass + def GET_privacy(self): pass + + `GET_password` would get called for `/prefs/password` while `GET_privacy` for + `GET_privacy` gets called for `/prefs/privacy`. + + If a user visits `/prefs/password/change` then `GET_password(self, '/change')` + is called. + """ + def internal(self, arg): + if '/' in arg: + first, rest = arg.split('/', 1) + func = prefix + first + args = ['/' + rest] + else: + func = prefix + arg + args = [] + + if hasattr(self, func): + try: + return getattr(self, func)(*args) + except TypeError: + return notfound() + else: + return notfound() + return internal + +def background(func): + """A function decorator to run a long-running function as a background thread.""" + def internal(*a, **kw): + data() # cache it + ctx = _context[currentThread()] + _context[currentThread()] = storage(ctx.copy()) + + def newfunc(): + _context[currentThread()] = ctx + func(*a, **kw) + + t = threading.Thread(target=newfunc) + background.threaddb[id(t)] = t + t.start() + ctx.headers = [] + return seeother(changequery(_t=id(t))) + return internal +background.threaddb = {} + +def backgrounder(func): + def internal(*a, **kw): + i = input(_method='get') + if '_t' in i: + try: + t = background.threaddb[int(i._t)] + except KeyError: + return notfound() + _context[currentThread()] = _context[t] + return + else: + return func(*a, **kw) + return internal + +## HTTP Functions + +def httpdate(date_obj): + """Formats a datetime object for use in HTTP headers.""" + return date_obj.strftime("%a, %d %b %Y %H:%M:%S GMT") + +def parsehttpdate(string_): + """Parses an HTTP date into a datetime object.""" + try: + t = time.strptime(string_, "%a, %d %b %Y %H:%M:%S %Z") + except ValueError: + return None + return datetime.datetime(*t[:6]) + +def expires(delta): + """ + Outputs an `Expires` header for `delta` from now. + `delta` is a `timedelta` object or a number of seconds. + """ + try: + datetime + except NameError: + raise Exception, "requires Python 2.3 or later" + if isinstance(delta, (int, long)): + delta = datetime.timedelta(seconds=delta) + date_obj = datetime.datetime.utcnow() + delta + header('Expires', httpdate(date_obj)) + +def lastmodified(date_obj): + """Outputs a `Last-Modified` header for `datetime`.""" + header('Last-Modified', httpdate(date_obj)) + +def modified(date=None, etag=None): + n = ctx.env.get('HTTP_IF_NONE_MATCH') + m = parsehttpdate(ctx.env.get('HTTP_IF_MODIFIED_SINCE', '').split(';')[0]) + validate = False + if etag: + raise NotImplementedError, "no etag support yet" + # should really be a warning + if date and m: + # we subtract a second because + # HTTP dates don't have sub-second precision + if date-datetime.timedelta(seconds=1) <= m: + validate = True + + if validate: ctx.status = '304 Not Modified' + return not validate + +""" +By default, these all return simple error messages that send very short messages +(like "bad request") to the user. They can and should be overridden +to return nicer ones. +""" +def redirect(url, status='301 Moved Permanently'): + """ + Returns a `status` redirect to the new URL. + `url` is joined with the base URL so that things like + `redirect("about") will work properly. + """ + newloc = urlparse.urljoin(ctx.home + ctx.path, url) + ctx.status = status + ctx.output = '' + header('Content-Type', 'text/html') + header('Location', newloc) + # seems to add a three-second delay for some reason: + # output('<a href="'+ newloc + '">moved permanently</a>') + +def found(url): + """A `302 Found` redirect.""" + return redirect(url, '302 Found') + +def seeother(url): + """A `303 See Other` redirect.""" + return redirect(url, '303 See Other') + +def tempredirect(url): + """A `307 Temporary Redirect` redirect.""" + return redirect(url, '307 Temporary Redirect') + +def badrequest(): + """Return a `400 Bad Request` error.""" + ctx.status = '400 Bad Request' + header('Content-Type', 'text/html') + return output('bad request') + +def notfound(): + """Returns a `404 Not Found` error.""" + ctx.status = '404 Not Found' + header('Content-Type', 'text/html') + return output('not found') + +def nomethod(cls): + """Returns a `405 Method Not Allowed` error for `cls`.""" + ctx.status = '405 Method Not Allowed' + header('Content-Type', 'text/html') + header('Allow', \ + ', '.join([method for method in \ + ['GET', 'HEAD', 'POST', 'PUT', 'DELETE'] \ + if hasattr(cls, method)])) + + # commented out for the same reason redirect is + # return output('method not allowed') + +def gone(): + """Returns a `410 Gone` error.""" + ctx.status = '410 Gone' + header('Content-Type', 'text/html') + return output("gone") + +def internalerror(): + """Returns a `500 Internal Server` error.""" + ctx.status = "500 Internal Server Error" + ctx.headers = [('Content-Type', 'text/html')] + ctx.output = "internal server error" + + +# adapted from Django <djangoproject.com> +# Copyright (c) 2005, the Lawrence Journal-World +# Used under the modified BSD license: +# http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5 + +DJANGO_500_PAGE = """#import inspect +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> +<html lang="en"> +<head> + <meta http-equiv="content-type" content="text/html; charset=utf-8" /> + <meta name="robots" content="NONE,NOARCHIVE" /> + <title>$exception_type at $ctx.path</title> + <style type="text/css"> + html * { padding:0; margin:0; } + body * { padding:10px 20px; } + body * * { padding:0; } + body { font:small sans-serif; } + body>div { border-bottom:1px solid #ddd; } + h1 { font-weight:normal; } + h2 { margin-bottom:.8em; } + h2 span { font-size:80%; color:#666; font-weight:normal; } + h3 { margin:1em 0 .5em 0; } + h4 { margin:0 0 .5em 0; font-weight: normal; } + table { + border:1px solid #ccc; border-collapse: collapse; background:white; } + tbody td, tbody th { vertical-align:top; padding:2px 3px; } + thead th { + padding:1px 6px 1px 3px; background:#fefefe; text-align:left; + font-weight:normal; font-size:11px; border:1px solid #ddd; } + tbody th { text-align:right; color:#666; padding-right:.5em; } + table.vars { margin:5px 0 2px 40px; } + table.vars td, table.req td { font-family:monospace; } + table td.code { width:100%;} + table td.code div { overflow:hidden; } + table.source th { color:#666; } + table.source td { + font-family:monospace; white-space:pre; border-bottom:1px solid #eee; } + ul.traceback { list-style-type:none; } + ul.traceback li.frame { margin-bottom:1em; } + div.context { margin: 10px 0; } + div.context ol { + padding-left:30px; margin:0 10px; list-style-position: inside; } + div.context ol li { + font-family:monospace; white-space:pre; color:#666; cursor:pointer; } + div.context ol.context-line li { color:black; background-color:#ccc; } + div.context ol.context-line li span { float: right; } + div.commands { margin-left: 40px; } + div.commands a { color:black; text-decoration:none; } + #summary { background: #ffc; } + #summary h2 { font-weight: normal; color: #666; } + #explanation { background:#eee; } + #template, #template-not-exist { background:#f6f6f6; } + #template-not-exist ul { margin: 0 0 0 20px; } + #traceback { background:#eee; } + #requestinfo { background:#f6f6f6; padding-left:120px; } + #summary table { border:none; background:transparent; } + #requestinfo h2, #requestinfo h3 { position:relative; margin-left:-100px; } + #requestinfo h3 { margin-bottom:-1em; } + .error { background: #ffc; } + .specific { color:#cc3300; font-weight:bold; } + </style> + <script type="text/javascript"> + //<!-- + function getElementsByClassName(oElm, strTagName, strClassName){ + // Written by Jonathan Snook, http://www.snook.ca/jon; + // Add-ons by Robert Nyman, http://www.robertnyman.com + var arrElements = (strTagName == "*" && document.all)? document.all : + oElm.getElementsByTagName(strTagName); + var arrReturnElements = new Array(); + strClassName = strClassName.replace(/\-/g, "\\-"); + var oRegExp = new RegExp("(^|\\s)" + strClassName + "(\\s|$)"); + var oElement; + for(var i=0; i<arrElements.length; i++){ + oElement = arrElements[i]; + if(oRegExp.test(oElement.className)){ + arrReturnElements.push(oElement); + } + } + return (arrReturnElements) + } + function hideAll(elems) { + for (var e = 0; e < elems.length; e++) { + elems[e].style.display = 'none'; + } + } + window.onload = function() { + hideAll(getElementsByClassName(document, 'table', 'vars')); + hideAll(getElementsByClassName(document, 'ol', 'pre-context')); + hideAll(getElementsByClassName(document, 'ol', 'post-context')); + } + function toggle() { + for (var i = 0; i < arguments.length; i++) { + var e = document.getElementById(arguments[i]); + if (e) { + e.style.display = e.style.display == 'none' ? 'block' : 'none'; + } + } + return false; + } + function varToggle(link, id) { + toggle('v' + id); + var s = link.getElementsByTagName('span')[0]; + var uarr = String.fromCharCode(0x25b6); + var darr = String.fromCharCode(0x25bc); + s.innerHTML = s.innerHTML == uarr ? darr : uarr; + return false; + } + //--> + </script> +</head> +<body> + +<div id="summary"> + <h1>$exception_type at $ctx.path</h1> + <h2>$exception_value</h2> + <table><tr> + <th>Python</th> + <td>$lastframe.filename in $lastframe.function, line $lastframe.lineno</td> + </tr><tr> + <th>Web</th> + <td>$ctx.method $ctx.home$ctx.path</td> + </tr></table> +</div> +<div id="traceback"> + <h2>Traceback <span>(innermost first)</span></h2> + <ul class="traceback"> + #for frame in $frames + <li class="frame"> + <code>$frame.filename</code> in <code>$frame.function</code> + + #if $frame.context_line + <div class="context" id="c$frame.id"> + #if $frame.pre_context + <ol start="$frame.pre_context_lineno" class="pre-context" id="pre$frame.id">#for line in $frame.pre_context#<li onclick="toggle('pre$frame.id', 'post$frame.id')">$line</li>#end for#</ol> + #end if + <ol start="$frame.lineno" class="context-line"><li onclick="toggle('pre$frame.id', 'post$frame.id')">$frame.context_line <span>...</span></li></ol> + #if $frame.post_context + <ol start='$(frame.lineno+1)' class="post-context" id="post$frame.id">#for line in $frame.post_context#<li onclick="toggle('pre$frame.id', 'post$frame.id')">$line</li>#end for#</ol> + #end if + </div> + #end if + + #if $frame.vars + <div class="commands"> + <a href='#' onclick="return varToggle(this, '$frame.id')"><span>▶</span> Local vars</a>## $inspect.formatargvalues(*inspect.getargvalues(frame['tb'].tb_frame)) + </div> + <table class="vars" id="v$frame.id"> + <thead> + <tr> + <th>Variable</th> + <th>Value</th> + </tr> + </thead> + <tbody> + #set frameitems = $frame.vars + #silent frameitems.sort(lambda x,y: cmp(x[0], y[0])) + #for (key, val) in frameitems + <tr> + <td>$key</td> + <td class="code"><div>$prettify(val)</div></td> + </tr> + #end for + </tbody> + </table> + #end if + </li> + #end for + </ul> +</div> + +<div id="requestinfo"> + #if $context_.output or $context_.headers + <h2>Response so far</h2> + <h3>HEADERS</h3> + #if $ctx.headers + <p class="req"><code> + #for (k, v) in $context_.headers + $k: $v<br /> + #end for + + </code></p> + #else + <p>No headers.</p> + #end if + <h3>BODY</h3> + <p class="req" style="padding-bottom: 2em"><code> + $context_.output + </code></p> + #end if + + <h2>Request information</h2> + + <h3>INPUT</h3> + #if $input_ + <table class="req"> + <thead> + <tr> + <th>Variable</th> + <th>Value</th> + </tr> + </thead> + <tbody> + #set myitems = $input_.items() + #silent myitems.sort(lambda x,y: cmp(x[0], y[0])) + #for (key, val) in myitems + <tr> + <td>$key</td> + <td class="code"><div>$val</div></td> + </tr> + #end for + </tbody> + </table> + #else + <p>No input data.</p> + #end if + + <h3 id="cookie-info">COOKIES</h3> + #if $cookies_ + <table class="req"> + <thead> + <tr> + <th>Variable</th> + <th>Value</th> + </tr> + </thead> + <tbody> + #for (key, val) in $cookies_.items() + <tr> + <td>$key</td> + <td class="code"><div>$val</div></td> + </tr> + #end for + </tbody> + </table> + #else + <p>No cookie data</p> + #end if + + <h3 id="meta-info">META</h3> + <table class="req"> + <thead> + <tr> + <th>Variable</th> + <th>Value</th> + </tr> + </thead> + <tbody> + #set myitems = $context_.items() + #silent myitems.sort(lambda x,y: cmp(x[0], y[0])) + #for (key, val) in $myitems + #if not $key.startswith('_') and $key not in ['env', 'output', 'headers', 'environ', 'status', 'db_execute'] + <tr> + <td>$key</td> + <td class="code"><div>$prettify($val)</div></td> + </tr> + #end if + #end for + </tbody> + </table> + + <h3 id="meta-info">ENVIRONMENT</h3> + <table class="req"> + <thead> + <tr> + <th>Variable</th> + <th>Value</th> + </tr> + </thead> + <tbody> + #set myitems = $context_.env.items() + #silent myitems.sort(lambda x,y: cmp(x[0], y[0])) + #for (key, val) in $myitems + <tr> + <td>$key</td> + <td class="code"><div>$prettify($val)</div></td> + </tr> + #end for + </tbody> + </table> + +</div> + +<div id="explanation"> + <p> + You're seeing this error because you have <code>web.internalerror</code> + set to <code>web.debugerror</code>. Change that if you want a different one. + </p> +</div> + +</body> +</html>""" + +def djangoerror(): + def _get_lines_from_file(filename, lineno, context_lines): + """ + Returns context_lines before and after lineno from file. + Returns (pre_context_lineno, pre_context, context_line, post_context). + """ + try: + source = open(filename).readlines() + lower_bound = max(0, lineno - context_lines) + upper_bound = lineno + context_lines + + pre_context = \ + [line.strip('\n') for line in source[lower_bound:lineno]] + context_line = source[lineno].strip('\n') + post_context = \ + [line.strip('\n') for line in source[lineno + 1:upper_bound]] + + return lower_bound, pre_context, context_line, post_context + except (OSError, IOError): + return None, [], None, [] + + exception_type, exception_value, tback = sys.exc_info() + frames = [] + while tback is not None: + filename = tback.tb_frame.f_code.co_filename + function = tback.tb_frame.f_code.co_name + lineno = tback.tb_lineno - 1 + pre_context_lineno, pre_context, context_line, post_context = \ + _get_lines_from_file(filename, lineno, 7) + frames.append({ + 'tback': tback, + 'filename': filename, + 'function': function, + 'lineno': lineno, + 'vars': tback.tb_frame.f_locals.items(), + 'id': id(tback), + 'pre_context': pre_context, + 'context_line': context_line, + 'post_context': post_context, + 'pre_context_lineno': pre_context_lineno, + }) + tback = tback.tb_next + lastframe = frames[-1] + frames.reverse() + urljoin = urlparse.urljoin + input_ = input() + cookies_ = cookies() + context_ = ctx + def prettify(x): + try: + out = pprint.pformat(x) + except Exception, e: + out = '[could not display: <' + e.__class__.__name__ + \ + ': '+str(e)+'>]' + return out + return render(DJANGO_500_PAGE, asTemplate=True, isString=True) + +def debugerror(): + """ + A replacement for `internalerror` that presents a nice page with lots + of debug information for the programmer. + + (Based on the beautiful 500 page from [Django](http://djangoproject.com/), + designed by [Wilson Miner](http://wilsonminer.com/).) + + Requires [Cheetah](http://cheetahtemplate.org/). + """ + # need to do django first, so it can get the old stuff + if _hasTemplating: + out = str(djangoerror()) + else: + # Cheetah isn't installed + out = """<p>You've set web.py to use the fancier debugerror error +messages, but these messages require you install the Cheetah template +system. For more information, see +<a href="http://webpy.org/">the web.py website</a>.</p> + +<p>In the meantime, here's a plain old error message:</p> + +<pre>%s</pre> + +<p>(If it says something about 'Compiler', then it's probably +because you're trying to use templates and you haven't +installed Cheetah. See above.)</p> +""" % htmlquote(traceback.format_exc()) + ctx.status = "500 Internal Server Error" + ctx.headers = [('Content-Type', 'text/html')] + ctx.output = out + + +## Rendering + +r_include = re_compile(r'(?!\\)#include \"(.*?)\"($|#)', re.M) +def __compiletemplate(template, base=None, isString=False): + if isString: + text = template + else: + text = open('templates/'+template).read() + # implement #include at compile-time + def do_include(match): + text = open('templates/'+match.groups()[0]).read() + return text + while r_include.findall(text): + text = r_include.sub(do_include, text) + + execspace = _compiletemplate.bases.copy() + tmpl_compiler = Compiler(source=text, mainClassName='GenTemplate') + tmpl_compiler.addImportedVarNames(execspace.keys()) + exec str(tmpl_compiler) in execspace + if base: + _compiletemplate.bases[base] = execspace['GenTemplate'] + + return execspace['GenTemplate'] + +_compiletemplate = memoize(__compiletemplate) +_compiletemplate.bases = {} + +def htmlquote(text): + """Encodes `text` for raw use in HTML.""" + text = text.replace("&", "&") # Must be done first! + text = text.replace("<", "<") + text = text.replace(">", ">") + text = text.replace("'", "'") + text = text.replace('"', """) + return text + +def websafe(val): + """ + Converts `val` so that it's safe for use in HTML. + + HTML metacharacters are encoded, + None becomes the empty string, and + unicode is converted to UTF-8. + """ + if val is None: return '' + if not isinstance(val, unicode): val = str(val) + return htmlquote(val) + +if _hasTemplating: + class WebSafe(Filter): + def filter(self, val, **keywords): + return websafe(val) + +def render(template, terms=None, asTemplate=False, base=None, + isString=False): + """ + Renders a template, caching where it can. + + `template` is the name of a file containing the a template in + the `templates/` folder, unless `isString`, in which case it's the + template itself. + + `terms` is a dictionary used to fill the template. If it's None, then + the caller's local variables are used instead, plus context, if it's not + already set, is set to `context`. + + If asTemplate is False, it `output`s the template directly. Otherwise, + it returns the template object. + + If the template is a potential base template (that is, something other templates) + can extend, then base should be a string with the name of the template. The + template will be cached and made available for future calls to `render`. + + Requires [Cheetah](http://cheetahtemplate.org/). + """ + # terms=['var1', 'var2'] means grab those variables + if isinstance(terms, list): + new = {} + old = upvars() + for k in terms: + new[k] = old[k] + terms = new + # default: grab all locals + elif terms is None: + terms = {'context': context, 'ctx':ctx} + terms.update(sys._getframe(1).f_locals) + # terms=d means use d as the searchList + if not isinstance(terms, tuple): + terms = (terms,) + + if not isString and template.endswith('.html'): + header('Content-Type','text/html; charset=utf-8', unique=True) + + compiled_tmpl = _compiletemplate(template, base=base, isString=isString) + compiled_tmpl = compiled_tmpl(searchList=terms, filter=WebSafe) + if asTemplate: + return compiled_tmpl + else: + return output(str(compiled_tmpl)) + +## Input Forms + +def input(*requireds, **defaults): + """ + Returns a `storage` object with the GET and POST arguments. + See `storify` for how `requireds` and `defaults` work. + """ + from cStringIO import StringIO + def dictify(fs): return dict([(k, fs[k]) for k in fs.keys()]) + + _method = defaults.pop('_method', 'both') + + e = ctx.env.copy() + out = {} + if _method.lower() in ['both', 'post']: + a = {} + if e['REQUEST_METHOD'] == 'POST': + a = cgi.FieldStorage(fp = StringIO(data()), environ=e, + keep_blank_values=1) + a = dictify(a) + out = dictadd(out, a) + + if _method.lower() in ['both', 'get']: + e['REQUEST_METHOD'] = 'GET' + a = dictify(cgi.FieldStorage(environ=e, keep_blank_values=1)) + out = dictadd(out, a) + + try: + return storify(out, *requireds, **defaults) + except KeyError: + badrequest() + raise StopIteration + +def data(): + """Returns the data sent with the request.""" + if 'data' not in ctx: + cl = intget(ctx.env.get('CONTENT_LENGTH'), 0) + ctx.data = ctx.env['wsgi.input'].read(cl) + return ctx.data + +def changequery(**kw): + """ + Imagine you're at `/foo?a=1&b=2`. Then `changequery(a=3)` will return + `/foo?a=3&b=2` -- the same URL but with the arguments you requested + changed. + """ + query = input(_method='get') + for k, v in kw.iteritems(): + if v is None: + query.pop(k, None) + else: + query[k] = v + out = ctx.path + if query: + out += '?' + urllib.urlencode(query) + return out + +## Cookies + +def setcookie(name, value, expires="", domain=None): + """Sets a cookie.""" + if expires < 0: + expires = -1000000000 + kargs = {'expires': expires, 'path':'/'} + if domain: + kargs['domain'] = domain + # @@ should we limit cookies to a different path? + cookie = Cookie.SimpleCookie() + cookie[name] = value + for key, val in kargs.iteritems(): + cookie[name][key] = val + header('Set-Cookie', cookie.items()[0][1].OutputString()) + +def cookies(*requireds, **defaults): + """ + Returns a `storage` object with all the cookies in it. + See `storify` for how `requireds` and `defaults` work. + """ + cookie = Cookie.SimpleCookie() + cookie.load(ctx.env.get('HTTP_COOKIE', '')) + try: + return storify(cookie, *requireds, **defaults) + except KeyError: + badrequest() + raise StopIteration + +## WSGI Sugar + +def header(hdr, value, unique=False): + """ + Adds the header `hdr: value` with the response. + + If `unique` is True and a header with that name already exists, + it doesn't add a new one. If `unique` is None and a header with + that name already exists, it replaces it with this one. + """ + if unique is True: + for h, v in ctx.headers: + if h == hdr: return + elif unique is None: + ctx.headers = [h for h in ctx.headers if h[0] != hdr] + + ctx.headers.append((hdr, value)) + +def output(string_): + """Appends `string_` to the response.""" + if isinstance(string_, unicode): string_ = string_.encode('utf8') + if ctx.get('flush'): + ctx._write(string_) + else: + ctx.output += str(string_) + +def flush(): + ctx.flush = True + return flush + +def write(cgi_response): + """ + Converts a standard CGI-style string response into `header` and + `output` calls. + """ + cgi_response = str(cgi_response) + cgi_response.replace('\r\n', '\n') + head, body = cgi_response.split('\n\n', 1) + lines = head.split('\n') + + for line in lines: + if line.isspace(): + continue + hdr, value = line.split(":", 1) + value = value.strip() + if hdr.lower() == "status": + ctx.status = value + else: + header(hdr, value) + + output(body) + +def webpyfunc(inp, fvars=None, autoreload=False): + """If `inp` is a url mapping, returns a function that calls handle.""" + if not fvars: + fvars = upvars() + if not hasattr(inp, '__call__'): + if autoreload: + # black magic to make autoreload work: + mod = \ + __import__( + fvars['__file__'].split(os.path.sep).pop().split('.')[0]) + #@@probably should replace this with some inspect magic + name = dictfind(fvars, inp) + func = lambda: handle(getattr(mod, name), mod) + else: + func = lambda: handle(inp, fvars) + else: + func = inp + return func + +def wsgifunc(func, *middleware): + """Returns a WSGI-compatible function from a webpy-function.""" + middleware = list(middleware) + if reloader in middleware: + relr = reloader(None) + relrcheck = relr.check + middleware.remove(reloader) + else: + relr = None + relrcheck = lambda: None + + def wsgifunc(env, start_resp): + _load(env) + relrcheck() + try: + result = func() + except StopIteration: + result = None + + is_generator = result and hasattr(result, 'next') + if is_generator: + # wsgi requires the headers first + # so we need to do an iteration + # and save the result for later + try: + firstchunk = result.next() + except StopIteration: + firstchunk = '' + + status, headers, output = ctx.status, ctx.headers, ctx.output + ctx._write = start_resp(status, headers) + + # and now, the fun: + + def cleanup(): + # we insert this little generator + # at the end of our itertools.chain + # so that it unloads the request + # when everything else is done + + yield '' # force it to be a generator + _unload() + + # result is the output of calling the webpy function + # it could be a generator... + + if is_generator: + if firstchunk is flush: + # oh, it's just our special flush mode + # ctx._write is set up, so just continue execution + try: + result.next() + except StopIteration: + pass + + _unload() + return [] + else: + return itertools.chain([firstchunk], result, cleanup()) + + # ... but it's usually just None + # + # output is the stuff in ctx.output + # it's usually a string... + if isinstance(output, str): #@@ other stringlikes? + _unload() + return [output] + # it could be a generator... + elif hasattr(output, 'next'): + return itertools.chain(output, cleanup()) + else: + _unload() + raise Exception, "Invalid web.ctx.output" + + for mw_func in middleware: + wsgifunc = mw_func(wsgifunc) + + if relr: + relr.func = wsgifunc + return wsgifunc + return wsgifunc + +def run(inp, *middleware): + """ + Starts handling requests. If called in a CGI or FastCGI context, it will follow + that protocol. If called from the command line, it will start an HTTP + server on the port named in the first command line argument, or, if there + is no argument, on port 8080. + + `input` is a callable, then it's called with no arguments. + Otherwise, it's a `mapping` object to be passed to `handle(...)`. + + **Caveat:** So that `reloader` will work correctly, input has to be a variable, + it can't be a tuple passed in directly. + + `middleware` is a list of WSGI middleware which is applied to the resulting WSGI + function. + """ + autoreload = reloader in middleware + fvars = upvars() + return runwsgi(wsgifunc(webpyfunc(inp, fvars, autoreload), *middleware)) + +def runwsgi(func): + """ + Runs a WSGI-compatible function using FCGI, SCGI, or a simple web server, + as appropriate. + """ + #@@ improve detection + if os.environ.has_key('SERVER_SOFTWARE'): # cgi + os.environ['FCGI_FORCE_CGI'] = 'Y' + + if (os.environ.has_key('PHP_FCGI_CHILDREN') #lighttpd fastcgi + or os.environ.has_key('SERVER_SOFTWARE') + or 'fcgi' in sys.argv or 'fastcgi' in sys.argv): + return runfcgi(func) + + if 'scgi' in sys.argv: + return runscgi(func) + + # command line: + return runsimple(func, validip(listget(sys.argv, 1, ''))) + +def runsimple(func, server_address=("0.0.0.0", 8080)): + """ + Runs a simple HTTP server hosting WSGI app `func`. The directory `static/` + is hosted statically. + + Based on [WsgiServer][ws] from [Colin Stewart][cs]. + + [ws]: http://www.owlfish.com/software/wsgiutils/documentation/wsgi-server-api.html + [cs]: http://www.owlfish.com/ + """ + # Copyright (c) 2004 Colin Stewart (http://www.owlfish.com/) + # Modified somewhat for simplicity + # Used under the modified BSD license: + # http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5 + + import SimpleHTTPServer, SocketServer, BaseHTTPServer, urlparse + import socket, errno + import traceback + + class WSGIHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): + def run_wsgi_app(self): + protocol, host, path, parameters, query, fragment = \ + urlparse.urlparse('http://dummyhost%s' % self.path) + # we only use path, query + env = {'wsgi.version': (1, 0) + ,'wsgi.url_scheme': 'http' + ,'wsgi.input': self.rfile + ,'wsgi.errors': sys.stderr + ,'wsgi.multithread': 1 + ,'wsgi.multiprocess': 0 + ,'wsgi.run_once': 0 + ,'REQUEST_METHOD': self.command + ,'REQUEST_URI': self.path + ,'PATH_INFO': path + ,'QUERY_STRING': query + ,'CONTENT_TYPE': self.headers.get('Content-Type', '') + ,'CONTENT_LENGTH': self.headers.get('Content-Length', '') + ,'REMOTE_ADDR': self.client_address[0] + ,'SERVER_NAME': self.server.server_address[0] + ,'SERVER_PORT': str(self.server.server_address[1]) + ,'SERVER_PROTOCOL': self.request_version + } + + for http_header, http_value in self.headers.items(): + env ['HTTP_%s' % http_header.replace('-', '_').upper()] = \ + http_value + + # Setup the state + self.wsgi_sent_headers = 0 + self.wsgi_headers = [] + + try: + # We have there environment, now invoke the application + result = self.server.app(env, self.wsgi_start_response) + try: + try: + for data in result: + if data: + self.wsgi_write_data(data) + finally: + if hasattr(result, 'close'): + result.close() + except socket.error, socket_err: + # Catch common network errors and suppress them + if (socket_err.args[0] in \ + (errno.ECONNABORTED, errno.EPIPE)): + return + except socket.timeout, socket_timeout: + return + except: + print >> debug, traceback.format_exc(), + internalerror() + if not self.wsgi_sent_headers: + self.wsgi_start_response(ctx.status, ctx.headers) + self.wsgi_write_data(ctx.output) + + if (not self.wsgi_sent_headers): + # We must write out something! + self.wsgi_write_data(" ") + return + + do_POST = run_wsgi_app + do_PUT = run_wsgi_app + do_DELETE = run_wsgi_app + + def do_GET(self): + if self.path.startswith('/static/'): + SimpleHTTPServer.SimpleHTTPRequestHandler.do_GET(self) + else: + self.run_wsgi_app() + + def wsgi_start_response(self, response_status, response_headers, + exc_info=None): + if (self.wsgi_sent_headers): + raise Exception \ + ("Headers already sent and start_response called again!") + # Should really take a copy to avoid changes in the application.... + self.wsgi_headers = (response_status, response_headers) + return self.wsgi_write_data + + def wsgi_write_data(self, data): + if (not self.wsgi_sent_headers): + status, headers = self.wsgi_headers + # Need to send header prior to data + status_code = status [:status.find(' ')] + status_msg = status [status.find(' ') + 1:] + self.send_response(int(status_code), status_msg) + for header, value in headers: + self.send_header(header, value) + self.end_headers() + self.wsgi_sent_headers = 1 + # Send the data + self.wfile.write(data) + + class WSGIServer(SocketServer.ThreadingMixIn, BaseHTTPServer.HTTPServer): + def __init__(self, func, server_address): + BaseHTTPServer.HTTPServer.__init__(self, + server_address, + WSGIHandler) + self.app = func + self.serverShuttingDown = 0 + + print "Launching server: http://%s:%d/" % server_address + WSGIServer(func, server_address).serve_forever() + +def makeserver(wsgi_server): + """Updates a flup-style WSGIServer with web.py-style error support.""" + class MyServer(wsgi_server): + def error(self, req): + w = req.stdout.write + internalerror() + w('Status: ' + ctx.status + '\r\n') + for (h, v) in ctx.headers: + w(h + ': ' + v + '\r\n') + w('\r\n' + ctx.output) + + return MyServer + +def runfcgi(func): + """Runs a WSGI-function with a FastCGI server.""" + from flup.server.fcgi import WSGIServer + if len(sys.argv) > 2: # progname, scgi + args = sys.argv[:] + if 'fastcgi' in args: args.remove('fastcgi') + elif 'fcgi' in args: args.remove('fcgi') + hostport = validaddr(args[1]) + elif len(sys.argv) > 1: + hostport = ('localhost', 8000) + else: + hostport = None + return makeserver(WSGIServer)(func, multiplexed=True, bindAddress=hostport).run() + +def runscgi(func): + """Runs a WSGI-function with an SCGI server.""" + from flup.server.scgi import WSGIServer + my_server = makeserver(WSGIServer) + if len(sys.argv) > 2: # progname, scgi + args = sys.argv[:] + args.remove('scgi') + hostport = validaddr(args[1]) + else: + hostport = ('localhost', 4000) + return my_server(func, bindAddress=hostport).run() + +## Debugging + +def debug(*args): + """ + Prints a prettyprinted version of `args` to stderr. + """ + try: + out = ctx.environ['wsgi.errors'] + except: + out = sys.stderr + for arg in args: + print >> out, pprint.pformat(arg) + return '' + +def debugwrite(x): + """writes debug data to error stream""" + try: + out = ctx.environ['wsgi.errors'] + except: + out = sys.stderr + out.write(x) +debug.write = debugwrite + +class Reloader: + """ + Before every request, checks to see if any loaded modules have changed on + disk and, if so, reloads them. + """ + def __init__(self, func): + self.func = func + self.mtimes = {} + global _compiletemplate + b = _compiletemplate.bases + _compiletemplate = globals()['__compiletemplate'] + _compiletemplate.bases = b + + def check(self): + for mod in sys.modules.values(): + try: + mtime = os.stat(mod.__file__).st_mtime + except (AttributeError, OSError, IOError): + continue + if mod.__file__.endswith('.pyc') and \ + os.path.exists(mod.__file__[:-1]): + mtime = max(os.stat(mod.__file__[:-1]).st_mtime, mtime) + if mod not in self.mtimes: + self.mtimes[mod] = mtime + elif self.mtimes[mod] < mtime: + try: + reload(mod) + except ImportError: + pass + return True + + def __call__(self, e, o): + self.check() + return self.func(e, o) +reloader = Reloader + +def profiler(app): + """Outputs basic profiling information at the bottom of each response.""" + def profile_internal(e, o): + out, result = profile(app)(e, o) + return out + ['<pre>' + result + '</pre>'] #@@encode + return profile_internal + +## Context + +class _outputter: + """Wraps `sys.stdout` so that print statements go into the response.""" + def write(self, string_): + if hasattr(ctx, 'output'): + return output(string_) + else: + _oldstdout.write(string_) + def flush(self): + return _oldstdout.flush() + def close(self): + return _oldstdout.close() + +_context = {currentThread():Storage()} +ctx = context = threadeddict(_context) + +ctx.__doc__ = """ +A `storage` object containing various information about the request: + +`environ` (aka `env`) + : A dictionary containing the standard WSGI environment variables. + +`host` + : The domain (`Host` header) requested by the user. + +`home` + : The base path for the application. + +`ip` + : The IP address of the requester. + +`method` + : The HTTP method used. + +`path` + : The path request. + +`fullpath` + : The full path requested, including query arguments. + +### Response Data + +`status` (default: "200 OK") + : The status code to be used in the response. + +`headers` + : A list of 2-tuples to be used in the response. + +`output` + : A string to be used as the response. +""" + +if not '_oldstdout' in globals(): + _oldstdout = sys.stdout + sys.stdout = _outputter() + +loadhooks = {} + +def load(): + """ + Loads a new context for the thread. + + You can ask for a function to be run at loadtime by + adding it to the dictionary `loadhooks`. + """ + _context[currentThread()] = Storage() + ctx.status = '200 OK' + ctx.headers = [] + if 'db_parameters' in globals(): + connect(**db_parameters) + + for x in loadhooks.values(): x() + +def _load(env): + load() + ctx.output = '' + ctx.environ = ctx.env = env + ctx.host = env.get('HTTP_HOST') + ctx.home = 'http://' + env.get('HTTP_HOST', '[unknown]') + \ + os.environ.get('REAL_SCRIPT_NAME', env.get('SCRIPT_NAME', '')) + ctx.ip = env.get('REMOTE_ADDR') + ctx.method = env.get('REQUEST_METHOD') + ctx.path = env.get('PATH_INFO') + # http://trac.lighttpd.net/trac/ticket/406 requires: + if env.get('SERVER_SOFTWARE', '').startswith('lighttpd/'): + ctx.path = lstrips(env.get('REQUEST_URI').split('?')[0], + os.environ.get('REAL_SCRIPT_NAME', env.get('SCRIPT_NAME', ''))) + + ctx.fullpath = ctx.path + if env.get('QUERY_STRING'): + ctx.fullpath += '?' + env.get('QUERY_STRING', '') + +unloadhooks = {} + +def unload(): + """ + Unloads the context for the thread. + + You can ask for a function to be run at loadtime by + adding it ot the dictionary `unloadhooks`. + """ + for x in unloadhooks.values(): x() + # ensures db cursors and such are GCed promptly + del _context[currentThread()] + +def _unload(): + unload() + +if __name__ == "__main__": + import doctest + doctest.testmod() + + urls = ('/web.py', 'source') + class source: + def GET(self): + header('Content-Type', 'text/python') + print open(sys.argv[0]).read() + run(urls) diff --git a/packages/python/python-webpy_0.138.bb b/packages/python/python-webpy_0.138.bb new file mode 100644 index 0000000000..557b9ee71e --- /dev/null +++ b/packages/python/python-webpy_0.138.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "A Lightweight Web Application Framework" +SECTION = "devel/python" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +LICENSE = "PSF" +RDEPENDS = "python-netserver" + +PR = "ml0" + +SRC_URI = "file://web.py" +S = "${WORKDIR}" + +inherit distutils-base + +do_install() { + install -d ${D}${libdir}/${PYTHON_DIR} + install -m 0755 web.py ${D}${libdir}/${PYTHON_DIR} +} + diff --git a/packages/python/python_2.4.3.bb b/packages/python/python_2.4.3.bb index 64e927c871..dafae9a3a8 100644 --- a/packages/python/python_2.4.3.bb +++ b/packages/python/python_2.4.3.bb @@ -62,7 +62,7 @@ do_install() { DESTDIR=${D} install } -include python-${PV}-manifest.inc +require python-${PV}-manifest.inc RPROVIDES_python-core = "python" RPROVIDES_python-curses = "python" diff --git a/packages/tslib/tslib_20060703.bb b/packages/tslib/tslib_20060703.bb index f4ff493b57..93ff37f956 100644 --- a/packages/tslib/tslib_20060703.bb +++ b/packages/tslib/tslib_20060703.bb @@ -6,7 +6,7 @@ LICENSE = "LGPL" RV := "${PV}" PV = "0.1+cvs-${RV}" -PR = "r0" +PR = "r1" SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib;date=${RV} \ file://usec_fix.patch;patch=1 \ @@ -38,7 +38,7 @@ do_install_append() { install -d ${D}${sysconfdir}/profile.d/ install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ case ${MACHINE} in - a780 | e680 | h3600 | h3900 | h1940 | h6300 | h2200 | ipaq-pxa270 | blueangel) + a780 | e680 | h3600 | h3900 | h1940 | h6300 | h2200 | ipaq-pxa270 | blueangel | h4000) install -d ${D}${datadir}/tslib for f in ts-2.6.conf ts.conf-h3600-2.4; do install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/ @@ -80,6 +80,8 @@ RDEPENDS_tslib-conf_h2200 = "detect-stylus" RDEPENDS_tslib-conf_h3600 = "detect-stylus" RDEPENDS_tslib-conf_h3900 = "detect-stylus" RDEPENDS_tslib-conf_h6300 = "detect-stylus" +RDEPENDS_tslib-conf_blueangel = "detect-stylus" +RDEPENDS_tslib-conf_h4000 = "detect-stylus" PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}" PACKAGE_ARCH_mnci = "${MACHINE_ARCH}" diff --git a/packages/wmctrl/.mtn2git_empty b/packages/wmctrl/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/wmctrl/.mtn2git_empty diff --git a/packages/wmctrl/wmctrl_1.07.bb b/packages/wmctrl/wmctrl_1.07.bb new file mode 100644 index 0000000000..59c367d310 --- /dev/null +++ b/packages/wmctrl/wmctrl_1.07.bb @@ -0,0 +1,20 @@ +# +# Copyright Matthias Hentges <devel@hentges.net> (c) 2006 +# License: MIT (see http://www.opensource.org/licenses/mit-license.php for a copy of the license) +# +# Filename: wmctrl_1.07.bb +# Date: 07-Jul-06 + +DESCRIPTION = "A UNIX/Linux command line tool to interact with an EWMH/NetWM compatible X Window Manager" +MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>" +HOMEPAGE = "http://sweb.cz/tripie/utils/wmctrl/" +LICENSE = "GPL" +PR = "r0" + +###################################################################################### + +SRC_URI = "http://sweb.cz/tripie/utils/wmctrl/dist/wmctrl-1.07.tar.gz" + +###################################################################################### + +inherit autotools |