summaryrefslogtreecommitdiff
path: root/packages/linux/linux-jlime-sh3-2.6.17
diff options
context:
space:
mode:
authorKristoffer Ericson <kristoffer_e1@hotmail.com>2006-07-12 18:39:30 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-07-12 18:39:30 +0000
commitb96d67560f2796fc73507dbfedb57125b89addd0 (patch)
tree8017c342e5277cf977ad066a80d96699db387aa9 /packages/linux/linux-jlime-sh3-2.6.17
parent2fb7dbea15a9defe06eff9e3d63a7ea342e71448 (diff)
(KERNEL CHANGES)
conf/distro/jlime-donkey.conf : minor updates linux/linux-jlime-arm-2.6.17/* : Fixes/updates of patches and config linux/linux-jlime-sh3-2.6.17/LinuxSH-2.6.17 : Update to CVS 20060712 * update of cvs from linuxsh, fixes some backlight/suspend issues. linux/linux-jlime-sh3-2.6.17/defconfig_jlime : Minor update to reflect patch.
Diffstat (limited to 'packages/linux/linux-jlime-sh3-2.6.17')
-rw-r--r--packages/linux/linux-jlime-sh3-2.6.17/LinuxSH-2.6.17.patch3741
-rw-r--r--packages/linux/linux-jlime-sh3-2.6.17/defconfig_jlime119
2 files changed, 2769 insertions, 1091 deletions
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 8f2e611eca..104b2e6a89 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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/CVS/Entries 2006-07-12 16:54:18.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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/CVS/Entries.Log 2006-07-12 16:54:18.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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/CVS/Repository 2006-07-12 16:54:18.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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/CVS/Root 2006-07-12 16:54:18.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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/ChangeLog 2006-07-12 16:54:18.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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/ChangeLog-1999 2006-07-12 16:54:18.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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/ChangeLog-2000 2006-07-12 16:54:18.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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/ChangeLog-2001 2006-07-12 16:54:18.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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/ChangeLog-2002 2006-07-12 16:54:19.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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/ChangeLog-2003 2006-07-12 16:54:19.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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/ChangeLog-2004 2006-07-12 16:54:19.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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/ChangeLog-2005 2006-07-12 16:54:19.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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/Documentation/CVS/Entries 2006-07-12 16:54:19.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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/Documentation/CVS/Repository 2006-07-12 16:54:19.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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/Documentation/CVS/Root 2006-07-12 16:54:19.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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/Documentation/sh/CVS/Entries 2006-07-12 16:54:19.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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/Documentation/sh/CVS/Repository 2006-07-12 16:54:19.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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/Documentation/sh/CVS/Root 2006-07-12 16:54:19.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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/Documentation/sh/new-machine.txt 2006-07-12 16:54:19.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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/Documentation/sh/register-banks.txt 2006-07-12 16:54:19.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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/Makefile 2006-07-12 16:54:19.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,23 +9397,23 @@ 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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/arch/CVS/Entries 2006-07-12 16:54:19.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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/arch/CVS/Repository 2006-07-12 16:54:19.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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/arch/CVS/Root 2006-07-12 16:54:19.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-07 10:17:06.000000000 +0000
-@@ -0,0 +1,13 @@
++++ linux-2.6.17/arch/sh/CVS/Entries 2006-07-12 16:54:19.000000000 +0000
+@@ -0,0 +1,14 @@
+/Kconfig.debug/1.4/Mon Jan 30 16:05:57 2006/-ko/
+D/boards////
+D/boot////
@@ -9425,21 +9425,22 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/CVS/Entries linux-2.6.17/arch/sh/CVS/Entr
+D/mm////
+D/oprofile////
+D/tools////
-+/Makefile/1.64/Wed Jul 5 14:49:59 2006/-ko/
-+/Kconfig/1.98/Thu Jul 6 12:38:00 2006/-ko/
++/Kconfig/1.100/Wed Jul 12 16:51:50 2006/-ko/
++/Makefile/1.65/Wed Jul 12 16:51:50 2006/-ko/
++D/math-emu////
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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/arch/sh/CVS/Repository 2006-07-12 16:54:19.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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/arch/sh/CVS/Root 2006-07-12 16:54:19.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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/arch/sh/Kconfig 2006-07-12 16:54:19.000000000 +0000
@@ -255,7 +255,7 @@
value on any of the known systems will only lead to disaster.
@@ -9449,7 +9450,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/Kconfig linux-2.6.17/arch/sh/Kconfig
default "0x00400000"
help
This sets the default memory size assumed by your SH kernel. It can
-@@ -335,7 +335,7 @@
+@@ -335,10 +335,19 @@
default y
help
Selecting this option will enable support for SH processors that
@@ -9458,21 +9459,33 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/Kconfig linux-2.6.17/arch/sh/Kconfig
This option must be set in order to enable the FPU.
-@@ -400,9 +400,11 @@
++config SH_FPU_EMU
++ bool "FPU emulation support"
++ depends on !SH_FPU && EXPERIMENTAL
++ default n
++ help
++ Selecting this option will enable support for software FPU emulation.
++ Most SH-3 users will want to say Y here, whereas most SH-4 users will
++ want to say N.
++
+ config SH_DSP
+ bool "DSP support"
+ depends on !CPU_SH4
+@@ -400,9 +409,11 @@
endmenu
-#source "arch/sh/boards/renesas/hs7751rvoip/Kconfig"
+source "arch/sh/boards/renesas/hs7751rvoip/Kconfig"
++
++source "arch/sh/boards/renesas/rts7751r2d/Kconfig"
-#source "arch/sh/boards/renesas/rts7751r2d/Kconfig"
-+source "arch/sh/boards/renesas/rts7751r2d/Kconfig"
-+
+source "arch/sh/boards/renesas/r7780rp/Kconfig"
config SH_PCLK_FREQ
int "Peripheral clock frequency (in Hz)"
-@@ -454,7 +456,7 @@
+@@ -454,7 +465,7 @@
config ISA_DMA_API
bool
@@ -9481,7 +9494,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/Kconfig linux-2.6.17/arch/sh/Kconfig
default y
menu "Kernel features"
-@@ -636,6 +638,16 @@
+@@ -636,6 +647,16 @@
endmenu
@@ -9500,7 +9513,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/Kconfig.debug 2006-07-12 16:54:21.000000000 +0000
@@ -32,6 +32,7 @@
config KGDB
@@ -9525,8 +9538,16 @@ 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-07 10:17:06.000000000 +0000
-@@ -104,16 +104,14 @@
++++ linux-2.6.17/arch/sh/Makefile 2006-07-12 16:54:19.000000000 +0000
+@@ -79,6 +79,7 @@
+ LIBGCC := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
+
+ core-y += arch/sh/kernel/ arch/sh/mm/
++core-$(CONFIG_SH_FPU_EMU) += arch/sh/math-emu/
+
+ # Boards
+ machdir-$(CONFIG_SH_SOLUTION_ENGINE) := se/770x
+@@ -104,16 +105,14 @@
machdir-$(CONFIG_SH_RTS7751R2D) := renesas/rts7751r2d
machdir-$(CONFIG_SH_7751_SYSTEMH) := renesas/systemh
machdir-$(CONFIG_SH_EDOSK7705) := renesas/edosk7705
@@ -9547,7 +9568,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/Makefile linux-2.6.17/arch/sh/Makefile
ifneq ($(machdir-y),)
core-y += arch/sh/boards/$(machdir-y)/
-@@ -137,17 +135,14 @@
+@@ -137,17 +136,14 @@
CPPFLAGS_vmlinux.lds := -traditional
@@ -9567,7 +9588,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/Makefile linux-2.6.17/arch/sh/Makefile
@echo ' SYMLINK include/asm-sh/cpu -> include/asm-sh/$(cpuincdir-y)'
$(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi
$(Q)ln -fsn $(incdir-prefix)$(cpuincdir-y) include/asm-sh/cpu
-@@ -157,7 +152,8 @@
+@@ -157,7 +153,8 @@
# don't, just reference the parent directory so the semantics are
# kept roughly the same.
@@ -9577,7 +9598,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/Makefile linux-2.6.17/arch/sh/Makefile
@echo -n ' SYMLINK include/asm-sh/mach -> '
$(Q)if [ ! -d include/asm-sh ]; then mkdir -p include/asm-sh; fi
$(Q)if [ -d $(incdir-prefix)$(incdir-y) ]; then \
-@@ -170,7 +166,7 @@
+@@ -170,7 +167,7 @@
fi
@touch $@
@@ -9588,7 +9609,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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/CVS/Entries 2006-07-12 16:54:19.000000000 +0000
@@ -0,0 +1,21 @@
+D/adx////
+D/bigsur////
@@ -9613,17 +9634,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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/CVS/Repository 2006-07-12 16:54:19.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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/CVS/Root 2006-07-12 16:54:19.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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/adx/CVS/Entries 2006-07-12 16:54:19.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 +9653,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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/adx/CVS/Repository 2006-07-12 16:54:19.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-07 10:17:06.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/adx/CVS/Root 2006-07-12 16:54:19.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/bigsur/CVS/Entries 2006-07-12 16:54:19.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 +9673,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/bigsur/CVS/Repository 2006-07-12 16:54:19.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/bigsur/CVS/Root 2006-07-12 16:54:19.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/cat68701/CVS/Entries 2006-07-12 16:54:19.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 +9691,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/cat68701/CVS/Repository 2006-07-12 16:54:19.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/cat68701/CVS/Root 2006-07-12 16:54:19.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/cqreek/CVS/Entries 2006-07-12 16:54:19.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 +9709,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/cqreek/CVS/Repository 2006-07-12 16:54:19.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/cqreek/CVS/Root 2006-07-12 16:54:19.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/cqreek/irq.c 2006-07-12 16:54:19.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,43 +9728,43 @@ 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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/dmida/CVS/Entries 2006-07-12 16:54:19.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/dmida/CVS/Repository 2006-07-12 16:54:19.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/dmida/CVS/Root 2006-07-12 16:54:19.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/dreamcast/CVS/Entries 2006-07-12 16:54:19.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//
-+/rtc.c/1.5/Fri Aug 26 20:12:14 2005/-ko/
+/setup.c/1.8/Wed Jan 4 13:24:06 2006//
++/rtc.c/1.6/Sat Jul 8 20:16:03 2006/-ko/
+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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/dreamcast/CVS/Repository 2006-07-12 16:54:19.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/dreamcast/CVS/Root 2006-07-12 16:54:19.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/dreamcast/irq.c 2006-07-12 16:54:19.000000000 +0000
@@ -26,10 +26,10 @@
event.
@@ -9761,7 +9782,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/dreamcast/rtc.c 2006-07-12 16:54:19.000000000 +0000
@@ -1,4 +1,5 @@
-/* arch/sh/kernel/rtc-aica.c
+/*
@@ -9808,9 +9829,19 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/dreamcast/rtc.c linux-2.6.17/arch/
unsigned long val1, val2;
unsigned long adj = secs + TWENTY_YEARS;
+@@ -75,7 +75,7 @@
+
+ void aica_time_init(void)
+ {
+- rtc_get_time = aica_rtc_gettimeofday;
+- rtc_set_time = aica_rtc_settimeofday;
++ rtc_sh_get_time = aica_rtc_gettimeofday;
++ rtc_sh_set_time = aica_rtc_settimeofday;
+ }
+
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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/dreamcast/setup.c 2006-07-12 16:54:19.000000000 +0000
@@ -25,18 +25,16 @@
#include <asm/io.h>
@@ -9834,7 +9865,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/ec3104/CVS/Entries 2006-07-12 16:54:19.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 +9874,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/ec3104/CVS/Repository 2006-07-12 16:54:19.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/ec3104/CVS/Root 2006-07-12 16:54:19.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/harp/CVS/Entries 2006-07-12 16:54:19.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 +9895,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/harp/CVS/Repository 2006-07-12 16:54:19.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/harp/CVS/Root 2006-07-12 16:54:19.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/hp6xx/CVS/Entries 2006-07-12 16:54:19.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 +9916,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/hp6xx/CVS/Repository 2006-07-12 16:54:19.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/hp6xx/CVS/Root 2006-07-12 16:54:19.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/hp6xx/Makefile 2006-07-12 16:54:19.000000000 +0000
@@ -2,5 +2,8 @@
# Makefile for the HP6xx specific parts of the kernel
#
@@ -9908,7 +9939,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/hp6xx/hp6xx_apm.c 2006-07-12 16:54:19.000000000 +0000
@@ -0,0 +1,123 @@
+/*
+ * bios-less APM driver for hp680
@@ -10035,7 +10066,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/hp6xx/pm.c 2006-07-12 16:54:19.000000000 +0000
@@ -0,0 +1,88 @@
+/*
+ * hp6x0 Power Management Routines
@@ -10127,7 +10158,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/hp6xx/pm_wakeup.S 2006-07-12 16:54:19.000000000 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2006 Andriy Skulysh <askulsyh@gmail.com>
@@ -10189,7 +10220,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/hp6xx/setup.c 2006-07-12 16:54:19.000000000 +0000
@@ -16,6 +16,9 @@
#include <asm/hp6xx/hp6xx.h>
#include <asm/cpu/dac.h>
@@ -10226,28 +10257,28 @@ 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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/landisk/CVS/Entries 2006-07-12 16:54:20.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/
+/irq.c/1.2/Sat Nov 12 13:02:45 2005/-ko/
+/landisk_pwb.c/1.2/Sat Nov 12 13:02:45 2005/-ko/
-+/rtc.c/1.2/Sat Nov 12 13:02:45 2005/-ko/
+/setup.c/1.3/Tue Jan 3 22:51:46 2006/-ko/
++/rtc.c/1.3/Sat Jul 8 20:16:03 2006/-ko/
+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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/landisk/CVS/Repository 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/landisk/CVS/Root 2006-07-12 16:54:19.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/landisk/Makefile 2006-07-12 16:54:20.000000000 +0000
@@ -0,0 +1,5 @@
+#
+# Makefile for I-O DATA DEVICE, INC. "LANDISK Series"
@@ -10256,7 +10287,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/landisk/io.c 2006-07-12 16:54:20.000000000 +0000
@@ -0,0 +1,250 @@
+/*
+ * arch/sh/boards/landisk/io.c
@@ -10510,7 +10541,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/landisk/irq.c 2006-07-12 16:54:20.000000000 +0000
@@ -0,0 +1,105 @@
+/*
+ * arch/sh/boards/landisk/irq.c
@@ -10619,7 +10650,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/landisk/landisk_pwb.c 2006-07-12 16:54:20.000000000 +0000
@@ -0,0 +1,348 @@
+/*
+ * arch/sh/boards/landisk/landisk_pwb.c -- driver for the Power control switch.
@@ -10971,8 +11002,8 @@ 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-07 10:17:07.000000000 +0000
-@@ -0,0 +1,102 @@
++++ linux-2.6.17/arch/sh/boards/landisk/rtc.c 2006-07-12 16:54:20.000000000 +0000
+@@ -0,0 +1,93 @@
+/*
+ * arch/sh/boards/landisk/rtc.c -- RTC support
+ *
@@ -10991,17 +11022,9 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/landisk/rtc.c linux-2.6.17/arch/sh
+#include <linux/time.h>
+#include <linux/delay.h>
+#include <linux/spinlock.h>
++#include <linux/bcd.h>
++#include <asm/rtc.h>
+
-+#ifndef BCD_TO_BIN
-+#define BCD_TO_BIN(val) ((val)=((val)&15) + ((val)>>4)*10)
-+#endif
-+
-+#ifndef BIN_TO_BCD
-+#define BIN_TO_BCD(val) ((val)=(((val)/10)<<4) + (val)%10)
-+#endif
-+
-+extern void (*rtc_get_time) (struct timespec *);
-+extern int (*rtc_set_time) (const time_t);
+extern spinlock_t rtc_lock;
+
+extern void
@@ -11069,15 +11092,14 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/landisk/rtc.c linux-2.6.17/arch/sh
+ return retval;
+}
+
-+
+void landisk_time_init(void)
+{
-+ rtc_get_time = landisk_rtc_gettimeofday;
-+ rtc_set_time = landisk_rtc_settimeofday;
++ rtc_sh_get_time = landisk_rtc_gettimeofday;
++ rtc_sh_set_time = landisk_rtc_settimeofday;
+}
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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/landisk/setup.c 2006-07-12 16:54:20.000000000 +0000
@@ -0,0 +1,179 @@
+/*
+ * arch/sh/boards/landisk/setup.c
@@ -11260,27 +11282,40 @@ 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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/mpc1211/CVS/Entries 2006-07-12 16:54:20.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/
+/pci.c/1.6/Mon Oct 25 10:41:01 2004/-ko/
+/setup.c/1.4/Sun Feb 5 21:55:28 2006/-ko/
-+/rtc.c/1.3/Wed Jul 5 14:50:09 2006/-ko/
++/rtc.c/1.4/Sat Jul 8 20:16:04 2006/-ko/
+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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/mpc1211/CVS/Repository 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/mpc1211/CVS/Root 2006-07-12 16:54:20.000000000 +0000
@@ -0,0 +1 @@
+:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh
+diff -ruN linux-2.6.17-vanilla/arch/sh/boards/mpc1211/rtc.c linux-2.6.17/arch/sh/boards/mpc1211/rtc.c
+--- linux-2.6.17-vanilla/arch/sh/boards/mpc1211/rtc.c 2006-06-18 01:49:35.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/mpc1211/rtc.c 2006-07-12 16:54:20.000000000 +0000
+@@ -130,7 +130,7 @@
+
+ void mpc1211_time_init(void)
+ {
+- rtc_get_time = mpc1211_rtc_gettimeofday;
+- rtc_set_time = mpc1211_rtc_settimeofday;
++ rtc_sh_get_time = mpc1211_rtc_gettimeofday;
++ rtc_sh_set_time = mpc1211_rtc_settimeofday;
+ }
+
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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/mpc1211/setup.c 2006-07-12 16:54:20.000000000 +0000
@@ -256,23 +256,12 @@
}
}
@@ -11309,7 +11344,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/overdrive/CVS/Entries 2006-07-12 16:54:20.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 +11359,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/overdrive/CVS/Repository 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/overdrive/CVS/Root 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/overdrive/overdrive.ttf 2006-07-12 16:54:20.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 +12143,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/CVS/Entries 2006-07-12 16:54:20.000000000 +0000
@@ -0,0 +1,5 @@
+D/edosk7705////
+D/hs7751rvoip////
@@ -12117,17 +12152,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/CVS/Repository 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/CVS/Root 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/edosk7705/CVS/Entries 2006-07-12 16:54:20.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 +12170,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/edosk7705/CVS/Repository 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/edosk7705/CVS/Root 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/edosk7705/Makefile 2006-07-12 16:54:20.000000000 +0000
@@ -1,10 +1,6 @@
#
# Makefile for the EDOSK7705 specific parts of the kernel
@@ -12159,7 +12194,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/CVS/Entries 2006-07-12 16:54:20.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 +12205,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/CVS/Repository 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/CVS/Root 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/Kconfig 2006-07-12 16:54:20.000000000 +0000
@@ -0,0 +1,12 @@
+if SH_HS7751RVOIP
+
@@ -12196,7 +12231,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/Makefile 2006-07-12 16:54:20.000000000 +0000
@@ -1,12 +1,8 @@
#
# Makefile for the HS7751RVoIP specific parts of the kernel
@@ -12213,7 +12248,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/io.c 2006-07-12 16:54:20.000000000 +0000
@@ -14,18 +14,13 @@
#include <linux/config.h>
#include <linux/kernel.h>
@@ -12612,7 +12647,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/hs7751rvoip/setup.c 2006-07-12 16:54:20.000000000 +0000
@@ -13,25 +13,68 @@
#include <linux/config.h>
#include <linux/init.h>
@@ -12746,7 +12781,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/r7780rp/CVS/Entries 2006-07-12 16:54:20.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 +12792,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/r7780rp/CVS/Repository 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/r7780rp/CVS/Root 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/r7780rp/Kconfig 2006-07-12 16:54:20.000000000 +0000
@@ -0,0 +1,14 @@
+if SH_R7780RP
+
@@ -12785,7 +12820,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/r7780rp/Makefile 2006-07-12 16:54:20.000000000 +0000
@@ -0,0 +1,6 @@
+#
+# Makefile for the R7780RP-1 specific parts of the kernel
@@ -12795,7 +12830,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/r7780rp/io.c 2006-07-12 16:54:20.000000000 +0000
@@ -0,0 +1,301 @@
+/*
+ * Copyright (C) 2001 Ian da Silva, Jeremy Siegel
@@ -13100,7 +13135,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/r7780rp/irq.c 2006-07-12 16:54:20.000000000 +0000
@@ -0,0 +1,123 @@
+/*
+ * linux/arch/sh/boards/renesas/r7780rp/irq.c
@@ -13227,7 +13262,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/r7780rp/led.c 2006-07-12 16:54:20.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) Atom Create Engineering Co., Ltd.
@@ -13276,7 +13311,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/r7780rp/setup.c 2006-07-12 16:54:20.000000000 +0000
@@ -0,0 +1,164 @@
+/*
+ * arch/sh/boards/renesas/r7780rp/setup.c
@@ -13444,29 +13479,29 @@ 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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/CVS/Entries 2006-07-12 16:54:20.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/
+/io.c/1.6/Sun Feb 5 21:55:28 2006/-ko/
+/irq.c/1.3/Fri Oct 28 13:12:48 2005/-ko/
-+/led.c/1.2/Wed Nov 23 15:42:02 2005/-ko/
+/mach.c/1.6/Tue Jan 3 22:51:46 2006/-ko/
-+/setup.c/1.4/Thu Feb 9 08:30:55 2006/-ko/
++/led.c/1.3/Sat Jul 8 20:16:04 2006/-ko/
++/setup.c/1.5/Sat Jul 8 20:16:04 2006/-ko/
+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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/CVS/Repository 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/CVS/Root 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/Kconfig 2006-07-12 16:54:20.000000000 +0000
@@ -0,0 +1,12 @@
+if SH_RTS7751R2D
+
@@ -13482,7 +13517,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/Makefile 2006-07-12 16:54:20.000000000 +0000
@@ -1,10 +1,6 @@
#
# Makefile for the RTS7751R2D specific parts of the kernel
@@ -13496,7 +13531,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/io.c 2006-07-12 16:54:20.000000000 +0000
@@ -1,6 +1,4 @@
/*
- * linux/arch/sh/kernel/io_rts7751r2d.c
@@ -13859,8 +13894,17 @@ 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-07 10:17:07.000000000 +0000
-@@ -56,12 +56,3 @@
++++ linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/led.c 2006-07-12 16:54:20.000000000 +0000
+@@ -13,8 +13,6 @@
+ #include <asm/io.h>
+ #include <asm/rts7751r2d/rts7751r2d.h>
+
+-extern unsigned int debug_counter;
+-
+ #ifdef CONFIG_HEARTBEAT
+
+ #include <linux/sched.h>
+@@ -56,12 +54,3 @@
ctrl_outw(value, PA_OUTPORT);
}
@@ -13875,7 +13919,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/mach.c 2006-07-12 16:54:20.000000000 +0000
@@ -16,15 +16,16 @@
#include <asm/machvec.h>
#include <asm/rtc.h>
@@ -13914,8 +13958,8 @@ 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-07 10:17:07.000000000 +0000
-@@ -1,25 +1,89 @@
++++ linux-2.6.17/arch/sh/boards/renesas/rts7751r2d/setup.c 2006-07-12 16:54:20.000000000 +0000
+@@ -1,25 +1,87 @@
/*
- * linux/arch/sh/kernel/setup_rts7751r2d.c
- *
@@ -13941,9 +13985,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/setup.c linux-2
-#include <asm/rts7751r2d/rts7751r2d.h>
+#include <asm/mach/rts7751r2d.h>
+#include <asm/mach/voyagergx_reg.h>
-
- unsigned int debug_counter;
-
++
+static struct plat_serial8250_port uart_platform_data[] = {
+ {
+ .membase = (void *)VOYAGER_UART_BASE,
@@ -13957,7 +13999,8 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/setup.c linux-2
+ .flags = 0,
+ },
+};
-+
+
+-unsigned int debug_counter;
+static void __init voyagergx_serial_init(void)
+{
+ unsigned long val;
@@ -13999,7 +14042,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/setup.c linux-2
+ ARRAY_SIZE(rts7751r2d_devices));
+}
+__initcall(rts7751r2d_devices_setup);
-+
+
const char *get_system_type(void)
{
return "RTS7751R2D";
@@ -14013,19 +14056,18 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/renesas/rts7751r2d/setup.c linux-2
/*
* Initialize the board
*/
-@@ -27,5 +91,9 @@
+@@ -27,5 +89,7 @@
{
printk(KERN_INFO "Renesas Technology Sales RTS7751R2D support.\n");
ctrl_outw(0x0000, PA_OUTPORT);
+- debug_counter = 0;
+ pm_power_off = rts7751r2d_power_off;
+
+ voyagergx_serial_init();
-+
- debug_counter = 0;
}
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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/systemh/CVS/Entries 2006-07-12 16:54:20.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 +14076,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/systemh/CVS/Repository 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/systemh/CVS/Root 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/systemh/io.c 2006-07-12 16:54:20.000000000 +0000
@@ -5,66 +5,25 @@
* Based largely on io_se.c.
*
@@ -14323,7 +14365,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/systemh/irq.c 2006-07-12 16:54:20.000000000 +0000
@@ -16,7 +16,7 @@
#include <linux/hdreg.h>
#include <linux/ide.h>
@@ -14335,7 +14377,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/renesas/systemh/setup.c 2006-07-12 16:54:20.000000000 +0000
@@ -15,9 +15,8 @@
* for more details.
*/
@@ -14374,7 +14416,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/saturn/CVS/Entries 2006-07-12 16:54:20.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 +14426,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/saturn/CVS/Repository 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/saturn/CVS/Root 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/7300/CVS/Entries 2006-07-12 16:54:20.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 +14446,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/7300/CVS/Repository 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/7300/CVS/Root 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/7300/io.c 2006-07-12 16:54:20.000000000 +0000
@@ -10,8 +10,8 @@
#include <linux/config.h>
@@ -14466,7 +14508,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/7300/irq.c 2006-07-12 16:54:20.000000000 +0000
@@ -12,7 +12,7 @@
#include <linux/irq.h>
#include <asm/irq.h>
@@ -14478,7 +14520,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/7300/led.c 2006-07-12 16:54:20.000000000 +0000
@@ -13,24 +13,10 @@
#include <linux/config.h>
@@ -14508,7 +14550,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/7300/setup.c 2006-07-12 16:54:20.000000000 +0000
@@ -10,8 +10,7 @@
#include <linux/config.h>
#include <linux/init.h>
@@ -14521,7 +14563,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/73180/CVS/Entries 2006-07-12 16:54:20.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 +14573,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/73180/CVS/Repository 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/73180/CVS/Root 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/73180/io.c 2006-07-12 16:54:20.000000000 +0000
@@ -100,6 +100,7 @@
badio(inw, port);
}
@@ -14583,7 +14625,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/73180/irq.c 2006-07-12 16:54:20.000000000 +0000
@@ -7,7 +7,6 @@
* Modified for SH-Mobile SolutionEngine 73180 Support
* by YOSHII Takashi <yoshii-takashi@hitachi-ul.co.jp>
@@ -14609,7 +14651,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/73180/led.c 2006-07-12 16:54:20.000000000 +0000
@@ -15,21 +15,8 @@
#include <linux/sched.h>
#include <asm/mach/se73180.h>
@@ -14635,7 +14677,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/73180/setup.c 2006-07-12 16:54:20.000000000 +0000
@@ -12,8 +12,8 @@
#include <linux/config.h>
#include <linux/init.h>
@@ -14657,7 +14699,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/770x/CVS/Entries 2006-07-12 16:54:20.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 +14710,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/770x/CVS/Repository 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/770x/CVS/Root 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/770x/Makefile 2006-07-12 16:54:20.000000000 +0000
@@ -2,5 +2,6 @@
# Makefile for the 770x SolutionEngine specific parts of the kernel
#
@@ -14689,7 +14731,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/770x/io.c 2006-07-12 16:54:20.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 +14869,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/770x/irq.c 2006-07-12 16:54:20.000000000 +0000
@@ -12,7 +12,7 @@
#include <linux/irq.h>
#include <asm/irq.h>
@@ -14839,7 +14881,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/770x/led.c 2006-07-12 16:54:20.000000000 +0000
@@ -10,22 +10,8 @@
*/
@@ -14871,7 +14913,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/770x/mach.c 2006-07-12 16:54:20.000000000 +0000
@@ -14,12 +14,9 @@
#include <asm/machvec.h>
@@ -14897,7 +14939,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/770x/setup.c 2006-07-12 16:54:20.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 +14959,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/7751/CVS/Entries 2006-07-12 16:54:20.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 +14971,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/7751/CVS/Repository 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/7751/CVS/Root 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/7751/Makefile 2006-07-12 16:54:20.000000000 +0000
@@ -2,7 +2,8 @@
# Makefile for the 7751 SolutionEngine specific parts of the kernel
#
@@ -14952,7 +14994,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/7751/io.c 2006-07-12 16:54:20.000000000 +0000
@@ -1,6 +1,4 @@
-/*
- * linux/arch/sh/kernel/io_7751se.c
@@ -15222,7 +15264,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/7751/irq.c 2006-07-12 16:54:20.000000000 +0000
@@ -13,7 +13,7 @@
#include <linux/init.h>
#include <linux/irq.h>
@@ -15234,7 +15276,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/7751/led.c 2006-07-12 16:54:20.000000000 +0000
@@ -8,24 +8,8 @@
*
* This file contains Solution Engine specific LED code.
@@ -15268,7 +15310,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/7751/mach.c 2006-07-12 16:54:20.000000000 +0000
@@ -11,12 +11,8 @@
#include <linux/config.h>
@@ -15294,7 +15336,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/7751/setup.c 2006-07-12 16:54:20.000000000 +0000
@@ -1,4 +1,4 @@
-/*
+/*
@@ -15316,7 +15358,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/CVS/Entries 2006-07-12 16:54:20.000000000 +0000
@@ -0,0 +1,4 @@
+D/7300////
+D/73180////
@@ -15324,36 +15366,69 @@ 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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/CVS/Repository 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/se/CVS/Root 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/sh03/CVS/Entries 2006-07-12 16:54:20.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/
+/setup.c/1.3/Sun Feb 5 21:55:29 2006/-ko/
-+/rtc.c/1.3/Wed Jul 5 14:50:16 2006/-ko/
++/rtc.c/1.4/Sat Jul 8 20:16:05 2006/-ko/
+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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/sh03/CVS/Repository 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/sh03/CVS/Root 2006-07-12 16:54:20.000000000 +0000
@@ -0,0 +1 @@
+:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh
+diff -ruN linux-2.6.17-vanilla/arch/sh/boards/sh03/rtc.c linux-2.6.17/arch/sh/boards/sh03/rtc.c
+--- linux-2.6.17-vanilla/arch/sh/boards/sh03/rtc.c 2006-06-18 01:49:35.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/sh03/rtc.c 2006-07-12 16:54:20.000000000 +0000
+@@ -10,9 +10,10 @@
+ #include <linux/sched.h>
+ #include <linux/time.h>
+ #include <linux/bcd.h>
+-#include <asm/io.h>
+ #include <linux/rtc.h>
+ #include <linux/spinlock.h>
++#include <asm/io.h>
++#include <asm/rtc.h>
+
+ #define RTC_BASE 0xb0000000
+ #define RTC_SEC1 (RTC_BASE + 0)
+@@ -34,8 +35,6 @@
+ #define RTC_BUSY 1
+ #define RTC_STOP 2
+
+-extern void (*rtc_get_time)(struct timespec *);
+-extern int (*rtc_set_time)(const time_t);
+ extern spinlock_t rtc_lock;
+
+ unsigned long get_cmos_time(void)
+@@ -128,6 +127,6 @@
+
+ void sh03_time_init(void)
+ {
+- rtc_get_time = sh03_rtc_gettimeofday;
+- rtc_set_time = sh03_rtc_settimeofday;
++ rtc_sh_get_time = sh03_rtc_gettimeofday;
++ rtc_sh_set_time = sh03_rtc_settimeofday;
+ }
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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/sh03/setup.c 2006-07-12 16:54:20.000000000 +0000
@@ -8,22 +8,18 @@
#include <linux/config.h>
#include <linux/init.h>
@@ -15421,43 +15496,43 @@ 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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/sh2000/CVS/Entries 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/sh2000/CVS/Repository 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/sh2000/CVS/Root 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/snapgear/CVS/Entries 2006-07-12 16:54:20.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//
-+/rtc.c/1.2/Wed Jan 4 18:42:42 2006//
+/setup.c/1.4/Wed Jan 4 18:42:42 2006//
++/rtc.c/1.3/Sat Jul 8 20:16:05 2006//
+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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/snapgear/CVS/Repository 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/snapgear/CVS/Root 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/snapgear/io.c 2006-07-12 16:54:20.000000000 +0000
@@ -1,6 +1,4 @@
-/*
- * linux/arch/sh/kernel/io_7751se.c
@@ -15712,7 +15787,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/snapgear/rtc.c 2006-07-12 16:54:20.000000000 +0000
@@ -17,10 +17,7 @@
#include <linux/time.h>
#include <linux/rtc.h>
@@ -15724,9 +15799,25 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/boards/snapgear/rtc.c linux-2.6.17/arch/s
/****************************************************************************/
+@@ -168,11 +165,11 @@
+ }
+
+ if (use_ds1302) {
+- rtc_get_time = snapgear_rtc_gettimeofday;
+- rtc_set_time = snapgear_rtc_settimeofday;
++ rtc_sh_get_time = snapgear_rtc_gettimeofday;
++ rtc_sh_set_time = snapgear_rtc_settimeofday;
+ } else {
+- rtc_get_time = sh_rtc_gettimeofday;
+- rtc_set_time = sh_rtc_settimeofday;
++ rtc_sh_get_time = sh_rtc_gettimeofday;
++ rtc_sh_set_time = sh_rtc_settimeofday;
+ }
+
+ printk("SnapGear RTC: using %s rtc.\n", use_ds1302 ? "ds1302" : "internal");
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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/snapgear/setup.c 2006-07-12 16:54:20.000000000 +0000
@@ -1,5 +1,4 @@
-/****************************************************************************/
-/*
@@ -15863,22 +15954,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/superh/CVS/Entries 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/superh/CVS/Repository 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/superh/CVS/Root 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/superh/microdev/CVS/Entries 2006-07-12 16:54:20.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 +15979,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/superh/microdev/CVS/Repository 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/superh/microdev/CVS/Root 2006-07-12 16:54:20.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/superh/microdev/setup.c 2006-07-12 16:54:21.000000000 +0000
@@ -398,7 +398,7 @@
/* enable the appropriate GPIO pins for IDE functionality:
* bit[0] In/Out 1==input; 0==output
@@ -15910,7 +16001,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/titan/CVS/Entries 2006-07-12 16:54:21.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 +16009,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/titan/CVS/Repository 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/titan/CVS/Root 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/titan/Makefile 2006-07-12 16:54:21.000000000 +0000
@@ -0,0 +1,5 @@
+#
+# Makefile for the Nimble Microsystems TITAN specific parts of the kernel
@@ -15937,7 +16028,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/titan/io.c 2006-07-12 16:54:21.000000000 +0000
@@ -0,0 +1,126 @@
+/*
+ * I/O routines for Titan
@@ -16067,7 +16158,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/titan/setup.c 2006-07-12 16:54:21.000000000 +0000
@@ -0,0 +1,59 @@
+/*
+ * Setup for Titan
@@ -16130,53 +16221,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/unknown/CVS/Entries 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/unknown/CVS/Repository 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boards/unknown/CVS/Root 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boot/.cvsignore 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boot/CVS/Entries 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boot/CVS/Repository 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boot/CVS/Root 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boot/compressed/.cvsignore 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boot/compressed/CVS/Entries 2006-07-12 16:54:21.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 +16277,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boot/compressed/CVS/Repository 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/boot/compressed/CVS/Root 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/cchips/CVS/Entries 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/cchips/CVS/Repository 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/cchips/CVS/Root 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/cchips/Kconfig 2006-07-12 16:54:21.000000000 +0000
@@ -65,6 +65,11 @@
Do not change this unless you know what you are doing.
@@ -16236,23 +16327,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/cchips/hd6446x/CVS/Entries 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/cchips/hd6446x/CVS/Repository 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/cchips/hd6446x/CVS/Root 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/cchips/hd6446x/hd64461/CVS/Entries 2006-07-12 16:54:21.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 +16351,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/cchips/hd6446x/hd64461/CVS/Repository 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/cchips/hd6446x/hd64461/CVS/Root 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/cchips/hd6446x/hd64461/io.c 2006-07-12 16:54:21.000000000 +0000
@@ -1,12 +1,12 @@
/*
- * $Id: io.c,v 1.6 2004/03/16 00:07:50 lethal Exp $
@@ -16336,7 +16427,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/cchips/hd6446x/hd64461/setup.c 2006-07-12 16:54:21.000000000 +0000
@@ -15,8 +15,7 @@
#include <asm/io.h>
@@ -16349,7 +16440,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/cchips/hd6446x/hd64465/CVS/Entries 2006-07-12 16:54:21.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 +16449,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/cchips/hd6446x/hd64465/CVS/Repository 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/cchips/hd6446x/hd64465/CVS/Root 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/cchips/voyagergx/CVS/Entries 2006-07-12 16:54:21.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 +16468,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/cchips/voyagergx/CVS/Repository 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/cchips/voyagergx/CVS/Root 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/cchips/voyagergx/Makefile 2006-07-12 16:54:21.000000000 +0000
@@ -4,5 +4,5 @@
obj-y := irq.o setup.o
@@ -16397,7 +16488,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/cchips/voyagergx/irq.c 2006-07-12 16:54:21.000000000 +0000
@@ -33,8 +33,7 @@
#include <asm/io.h>
@@ -16410,7 +16501,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/cchips/voyagergx/setup.c 2006-07-12 16:54:21.000000000 +0000
@@ -13,7 +13,7 @@
#include <linux/init.h>
#include <linux/module.h>
@@ -16422,7 +16513,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/configs/CVS/Entries 2006-07-12 16:54:21.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//
@@ -16445,17 +16536,17 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/CVS/Entries linux-2.6.17/arch/sh/
+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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/configs/CVS/Repository 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/configs/CVS/Root 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/configs/adx_defconfig 2006-07-12 16:54:21.000000000 +0000
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
@@ -16825,7 +16916,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/configs/cqreek_defconfig 2006-07-12 16:54:21.000000000 +0000
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
@@ -17190,7 +17281,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/configs/dreamcast_defconfig 2006-07-12 16:54:21.000000000 +0000
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
@@ -17986,7 +18077,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/configs/hp6xx_defconfig 2006-07-12 16:54:21.000000000 +0000
@@ -1,11 +1,12 @@
#
# Automatically generated make config: don't edit
@@ -18289,7 +18380,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/configs/hs7751rvoip_defconfig 2006-07-12 16:54:21.000000000 +0000
@@ -0,0 +1,884 @@
+#
+# Automatically generated make config: don't edit
@@ -19177,7 +19268,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/configs/landisk_defconfig 2006-07-12 16:54:21.000000000 +0000
@@ -0,0 +1,1372 @@
+#
+# Automatically generated make config: don't edit
@@ -20553,7 +20644,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/configs/microdev_defconfig 2006-07-12 16:54:21.000000000 +0000
@@ -1,9 +1,10 @@
#
# Automatically generated make config: don't edit
@@ -20751,7 +20842,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/configs/r7780rp_defconfig 2006-07-12 16:54:21.000000000 +0000
@@ -0,0 +1,1140 @@
+#
+# Automatically generated make config: don't edit
@@ -21895,7 +21986,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/configs/rts7751r2d_defconfig 2006-07-12 16:54:21.000000000 +0000
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
@@ -22637,7 +22728,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/configs/se7300_defconfig 2006-07-12 16:54:21.000000000 +0000
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
@@ -23097,7 +23188,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/configs/se73180_defconfig 2006-07-12 16:54:21.000000000 +0000
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
@@ -23561,7 +23652,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/configs/se7705_defconfig 2006-07-12 16:54:21.000000000 +0000
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
@@ -24259,7 +24350,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/configs/se7750_defconfig 2006-07-12 16:54:21.000000000 +0000
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
@@ -24933,7 +25024,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/configs/se7751_defconfig 2006-07-12 16:54:21.000000000 +0000
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
@@ -25682,7 +25773,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/configs/sh03_defconfig 2006-07-12 16:54:21.000000000 +0000
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
@@ -26452,7 +26543,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/configs/snapgear_defconfig 2006-07-12 16:54:21.000000000 +0000
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
@@ -27143,7 +27234,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/configs/systemh_defconfig 2006-07-12 16:54:21.000000000 +0000
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
@@ -27612,7 +27703,7 @@ 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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/configs/titan_defconfig 2006-07-12 16:54:21.000000000 +0000
@@ -0,0 +1,1551 @@
+#
+# Automatically generated make config: don't edit
@@ -29167,7 +29258,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/configs/titan_defconfig linux-2.6.17/arch
+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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/CVS/Entries 2006-07-12 16:54:21.000000000 +0000
@@ -0,0 +1,4 @@
+/Makefile/1.2/Thu Mar 17 07:43:07 2005//
+D/dma////
@@ -29175,17 +29266,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/CVS/Repository 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/CVS/Root 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/dma/CVS/Entries 2006-07-12 16:54:21.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//
@@ -29199,17 +29290,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/dma/CVS/Repository 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/dma/CVS/Root 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/dma/Kconfig 2006-07-12 16:54:21.000000000 +0000
@@ -11,6 +11,8 @@
config NR_ONCHIP_DMA_CHANNELS
depends on SH_DMA
@@ -29226,7 +29317,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/dma/dma-g2.c 2006-07-12 16:54:21.000000000 +0000
@@ -3,7 +3,7 @@
*
* G2 bus DMA support
@@ -29332,7 +29423,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/dma/dma-pvr2.c 2006-07-12 16:54:21.000000000 +0000
@@ -18,8 +18,8 @@
#include <asm/dma.h>
#include <asm/io.h>
@@ -29351,7 +29442,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/dma/dma-sh.c 2006-07-12 16:54:21.000000000 +0000
@@ -11,15 +11,11 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
@@ -29398,7 +29489,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/pci/CVS/Entries 2006-07-12 16:54:21.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//
@@ -29428,17 +29519,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/pci/CVS/Repository 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/pci/CVS/Root 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/pci/Makefile 2006-07-12 16:54:21.000000000 +0000
@@ -6,7 +6,8 @@
obj-$(CONFIG_PCI_AUTO) += pci-auto.o
@@ -29458,7 +29549,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/pci/fixups-dreamcast.c 2006-07-12 16:54:21.000000000 +0000
@@ -4,7 +4,7 @@
* PCI fixups for the Sega Dreamcast
*
@@ -29515,7 +29606,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/pci/fixups-r7780rp.c 2006-07-12 16:54:21.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+ * arch/sh/drivers/pci/fixups-r7780rp.c
@@ -29564,7 +29655,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/pci/fixups-rts7751r2d.c 2006-07-12 16:54:21.000000000 +0000
@@ -10,8 +10,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
@@ -29611,7 +29702,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/pci/fixups-sh03.c 2006-07-12 16:54:21.000000000 +0000
@@ -3,11 +3,7 @@
#include <linux/types.h>
#include <linux/pci.h>
@@ -29670,7 +29761,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/pci/ops-bigsur.c 2006-07-12 16:54:21.000000000 +0000
@@ -10,16 +10,13 @@
*
* PCI initialization for the Hitachi Big Sur Evaluation Board
@@ -29738,7 +29829,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/pci/ops-landisk.c 2006-07-12 16:54:21.000000000 +0000
@@ -0,0 +1,68 @@
+/*
+ * arch/sh/drivers/pci/ops-landisk.c
@@ -29810,7 +29901,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/pci/ops-r7780rp.c 2006-07-12 16:54:21.000000000 +0000
@@ -0,0 +1,75 @@
+/*
+ * Author: Ian DaSilva (idasilva@mvista.com)
@@ -29889,7 +29980,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/pci/ops-rts7751r2d.c 2006-07-12 16:54:21.000000000 +0000
@@ -18,12 +18,11 @@
#include <linux/delay.h>
#include <linux/pci.h>
@@ -29932,7 +30023,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/pci/ops-sh4.c 2006-07-12 16:54:21.000000000 +0000
@@ -0,0 +1,164 @@
+/*
+ * Generic SH-4 / SH-4A PCIC operations (SH7751, SH7780).
@@ -30100,7 +30191,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/pci/ops-snapgear.c 2006-07-12 16:54:21.000000000 +0000
@@ -2,7 +2,7 @@
* arch/sh/drivers/pci/ops-snapgear.c
*
@@ -30175,7 +30266,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/pci/ops-titan.c 2006-07-12 16:54:21.000000000 +0000
@@ -0,0 +1,83 @@
+/*
+ * arch/sh/drivers/pci/ops-titan.c
@@ -30262,7 +30353,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/pci/pci-auto.c 2006-07-12 16:54:21.000000000 +0000
@@ -45,11 +45,11 @@
#include <linux/types.h>
#include <linux/pci.h>
@@ -30436,7 +30527,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/pci/pci-sh4.h 2006-07-12 16:54:21.000000000 +0000
@@ -0,0 +1,180 @@
+#ifndef __PCI_SH4_H
+#define __PCI_SH4_H
@@ -30620,7 +30711,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/pci/pci-sh7751.c 2006-07-12 16:54:21.000000000 +0000
@@ -16,206 +16,44 @@
#undef DEBUG
@@ -31082,7 +31173,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/pci/pci-sh7751.h 2006-07-12 16:54:21.000000000 +0000
@@ -3,7 +3,7 @@
*
* Dustin McIntire (dustin@sensoria.com) (c) 2001
@@ -31288,7 +31379,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/pci/pci-sh7780.c 2006-07-12 16:54:21.000000000 +0000
@@ -0,0 +1,139 @@
+/*
+ * Low-Level PCI Support for the SH7780
@@ -31431,7 +31522,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/pci/pci-sh7780.h 2006-07-12 16:54:21.000000000 +0000
@@ -0,0 +1,94 @@
+/*
+ * Low-Level PCI Support for SH7780 targets
@@ -31529,7 +31620,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/pci/pci-st40.c 2006-07-12 16:54:21.000000000 +0000
@@ -71,12 +71,6 @@
static void pci_set_rbar_region(unsigned int region, unsigned long localAddr,
unsigned long pciOffset, unsigned long regionSize);
@@ -31651,7 +31742,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/pci/pci.c 2006-07-12 16:54:21.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 $
@@ -31817,29 +31908,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/superhyway/CVS/Entries 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/superhyway/CVS/Repository 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/drivers/superhyway/CVS/Root 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/.cvsignore 2006-07-12 16:54:22.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/CVS/Entries 2006-07-12 16:54:21.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//
@@ -31865,29 +31956,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//
-+/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/
-+/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/
++/setup.c/1.53/Sat Jul 8 20:16:09 2006/-ko/
++/time.c/1.38/Sat Jul 8 20:16:09 2006/-ko/
++/sh_ksyms.c/1.26/Wed Jul 12 16:51:54 2006//
++/traps.c/1.21/Wed Jul 12 16:51:54 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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/CVS/Repository 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/CVS/Root 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/Makefile 2006-07-12 16:54:22.000000000 +0000
@@ -6,7 +6,7 @@
obj-y := process.o signal.o entry.o traps.o irq.o \
@@ -31905,7 +31996,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/apm.c 2006-07-12 16:54:22.000000000 +0000
@@ -0,0 +1,539 @@
+/*
+ * bios-less APM driver for hp680
@@ -32448,7 +32539,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/cf-enabler.c 2006-07-12 16:54:22.000000000 +0000
@@ -11,7 +11,8 @@
#include <linux/config.h>
@@ -32498,7 +32589,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/cpu/CVS/Entries 2006-07-12 16:54:21.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/
@@ -32512,17 +32603,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/cpu/CVS/Repository 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/cpu/CVS/Root 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/cpu/clock.c 2006-07-12 16:54:22.000000000 +0000
@@ -225,7 +225,7 @@
{
int i, ret = 0;
@@ -32534,7 +32625,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/cpu/init.c 2006-07-12 16:54:22.000000000 +0000
@@ -4,6 +4,7 @@
* CPU init code
*
@@ -32581,44 +32672,60 @@ 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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/cpu/irq/CVS/Entries 2006-07-12 16:54:21.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/
-+/intc2.c/1.1/Sat Jan 7 20:16:39 2006/-ko/
+/ipr.c/1.2/Sun Jan 8 12:21:42 2006/-ko/
+/pint.c/1.1/Sat Jan 7 20:16:39 2006/-ko/
++/intc2.c/1.2/Wed Jul 12 16:51:54 2006/-ko/
+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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/cpu/irq/CVS/Repository 2006-07-12 16:54:21.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/cpu/irq/CVS/Root 2006-07-12 16:54:21.000000000 +0000
@@ -0,0 +1 @@
+:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh
+diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/irq/intc2.c linux-2.6.17/arch/sh/kernel/cpu/irq/intc2.c
+--- linux-2.6.17-vanilla/arch/sh/kernel/cpu/irq/intc2.c 2006-06-18 01:49:35.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/cpu/irq/intc2.c 2006-07-12 16:54:21.000000000 +0000
+@@ -241,9 +241,9 @@
+ /* 110-111 reserved/unused */
+ #elif defined(CONFIG_CPU_SUBTYPE_SH7780)
+ { TIMER_IRQ, 0, 24, 0, INTC_TMU0_MSK, 2},
+-#ifdef CONFIG_SH_RTC
+- { RTC_IRQ, 4, 0, 0, INTC_RTC_MSK, TIMER_PRIORITY },
+-#endif
++ { 21, 1, 0, 0, INTC_RTC_MSK, TIMER_PRIORITY },
++ { 22, 1, 1, 0, INTC_RTC_MSK, TIMER_PRIORITY },
++ { 23, 1, 2, 0, INTC_RTC_MSK, TIMER_PRIORITY },
+ { SCIF0_ERI_IRQ, 8, 24, 0, INTC_SCIF0_MSK, SCIF0_PRIORITY },
+ { SCIF0_RXI_IRQ, 8, 24, 0, INTC_SCIF0_MSK, SCIF0_PRIORITY },
+ { SCIF0_BRI_IRQ, 8, 24, 0, INTC_SCIF0_MSK, SCIF0_PRIORITY },
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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/cpu/sh2/CVS/Entries 2006-07-12 16:54:22.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/cpu/sh2/CVS/Repository 2006-07-12 16:54:22.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/cpu/sh2/CVS/Root 2006-07-12 16:54:22.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/cpu/sh3/CVS/Entries 2006-07-12 16:54:22.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/
@@ -32630,17 +32737,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/cpu/sh3/CVS/Repository 2006-07-12 16:54:22.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/cpu/sh3/CVS/Root 2006-07-12 16:54:22.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/cpu/sh3/clock-sh7709.c 2006-07-12 16:54:22.000000000 +0000
@@ -4,7 +4,7 @@
* SH7709 support for the clock framework
*
@@ -32661,9 +32768,8 @@ 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-07 10:17:07.000000000 +0000
-@@ -0,0 +1,11 @@
-+/Makefile/1.12/Sat Jan 7 20:16:39 2006/-ko/
++++ linux-2.6.17/arch/sh/kernel/cpu/sh4/CVS/Entries 2006-07-12 16:54:22.000000000 +0000
+@@ -0,0 +1,12 @@
+/clock-sh4-202.c/1.1/Sat Mar 26 20:25:36 2005/-ko/
+/clock-sh4.c/1.1/Sat Mar 26 20:25:36 2005/-ko/
+/clock-sh73180.c/1.1/Sat Mar 26 20:25:36 2005/-ko/
@@ -32673,21 +32779,23 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh4/CVS/Entries linux-2.6.17/a
+/fpu.c/1.5/Wed Mar 2 13:02:56 2005/-ko/
+/probe.c/1.6/Sat Oct 8 22:08:40 2005/-ko/
+/sq.c/1.15/Sat Jan 7 17:33:56 2006//
++/Makefile/1.13/Wed Jul 12 16:51:55 2006/-ko/
++/setup-sh7780.c/1.1/Tue Jul 11 07:57:40 2006/-ko/
+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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/cpu/sh4/CVS/Repository 2006-07-12 16:54:22.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/cpu/sh4/CVS/Root 2006-07-12 16:54:22.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-07 10:17:07.000000000 +0000
-@@ -4,7 +4,7 @@
++++ linux-2.6.17/arch/sh/kernel/cpu/sh4/Makefile 2006-07-12 16:54:22.000000000 +0000
+@@ -4,9 +4,12 @@
obj-y := ex.o probe.o
@@ -32695,10 +32803,15 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh4/Makefile linux-2.6.17/arch
+obj-$(CONFIG_SH_FPU) += fpu.o
obj-$(CONFIG_SH_STORE_QUEUES) += sq.o
++# CPU subtype setup
++obj-$(CONFIG_CPU_SUBTYPE_SH7780) += setup-sh7780.o
++
# Primary on-chip clocks (common)
+ clock-$(CONFIG_CPU_SH4) := clock-sh4.o
+ clock-$(CONFIG_CPU_SUBTYPE_SH73180) := clock-sh73180.o
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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/cpu/sh4/ex.S 2006-07-12 16:54:22.000000000 +0000
@@ -39,9 +39,9 @@
#endif
#if defined(CONFIG_SH_FPU)
@@ -32907,7 +33020,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/cpu/sh4/probe.c 2006-07-12 16:54:22.000000000 +0000
@@ -3,7 +3,7 @@
*
* CPU Subtype Probing for SH-4.
@@ -33056,9 +33169,65 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh4/probe.c linux-2.6.17/arch/
return 0;
}
+diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh4/setup-sh7780.c linux-2.6.17/arch/sh/kernel/cpu/sh4/setup-sh7780.c
+--- linux-2.6.17-vanilla/arch/sh/kernel/cpu/sh4/setup-sh7780.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/cpu/sh4/setup-sh7780.c 2006-07-12 16:54:22.000000000 +0000
+@@ -0,0 +1,52 @@
++/*
++ * SH7780 Setup
++ *
++ * Copyright (C) 2006 Paul Mundt
++ *
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License. See the file "COPYING" in the main directory of this archive
++ * for more details.
++ */
++#include <linux/platform_device.h>
++#include <linux/init.h>
++
++static struct resource rtc_resources[] = {
++ [0] = {
++ .start = 0xffe80000,
++ .end = 0xffe80000 + 0x58 - 1,
++ .flags = IORESOURCE_IO,
++ },
++ [1] = {
++ /* Period IRQ */
++ .start = 21,
++ .flags = IORESOURCE_IRQ,
++ },
++ [2] = {
++ /* Carry IRQ */
++ .start = 22,
++ .flags = IORESOURCE_IRQ,
++ },
++ [3] = {
++ /* Alarm IRQ */
++ .start = 23,
++ .flags = IORESOURCE_IRQ,
++ },
++};
++
++static struct platform_device rtc_device = {
++ .name = "sh-rtc",
++ .id = -1,
++ .num_resources = ARRAY_SIZE(rtc_resources),
++ .resource = rtc_resources,
++};
++
++static struct platform_device *sh7780_devices[] __initdata = {
++ &rtc_device,
++};
++
++static int __init sh7780_devices_setup(void)
++{
++ return platform_add_devices(sh7780_devices,
++ ARRAY_SIZE(sh7780_devices));
++}
++__initcall(sh7780_devices_setup);
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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/cpu/sh4/sq.c 2006-07-12 16:54:22.000000000 +0000
@@ -1,50 +1,53 @@
/*
- * arch/sh/kernel/cpu/sq.c
@@ -33754,7 +33923,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/early_printk.c 2006-07-12 16:54:22.000000000 +0000
@@ -59,34 +59,42 @@
#endif
@@ -33823,7 +33992,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/entry.S 2006-07-12 16:54:22.000000000 +0000
@@ -19,24 +19,6 @@
#include <asm/cpu/mmu_context.h>
#include <asm/unistd.h>
@@ -34179,7 +34348,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/head.S 2006-07-12 16:54:22.000000000 +0000
@@ -12,6 +12,17 @@
*/
#include <linux/linkage.h>
@@ -34255,7 +34424,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/kgdb_stub.c 2006-07-12 16:54:22.000000000 +0000
@@ -101,16 +101,17 @@
#include <linux/linkage.h>
#include <linux/init.h>
@@ -34318,7 +34487,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/machine_kexec.c 2006-07-12 16:54:22.000000000 +0000
@@ -27,7 +27,7 @@
const extern unsigned char relocate_new_kernel[];
@@ -34348,7 +34517,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/pm.c 2006-07-12 16:54:22.000000000 +0000
@@ -0,0 +1,88 @@
+/*
+ * Generic Power Management Routine
@@ -34440,7 +34609,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/process.c 2006-07-12 16:54:22.000000000 +0000
@@ -227,13 +227,13 @@
return fpvalid;
}
@@ -34487,7 +34656,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/ptrace.c 2006-07-12 16:54:22.000000000 +0000
@@ -225,7 +225,6 @@
case PTRACE_SETDSPREGS: {
@@ -34498,7 +34667,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/relocate_kernel.S 2006-07-12 16:54:22.000000000 +0000
@@ -12,8 +12,8 @@
#include <linux/linkage.h>
@@ -34581,7 +34750,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/semaphore.c 2006-07-12 16:54:22.000000000 +0000
@@ -14,7 +14,7 @@
#include <asm/semaphore.h>
#include <asm/semaphore-helper.h>
@@ -34591,18 +34760,58 @@ 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/setup.c linux-2.6.17/arch/sh/kernel/setup.c
+--- linux-2.6.17-vanilla/arch/sh/kernel/setup.c 2006-06-18 01:49:35.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/setup.c 2006-07-12 16:54:22.000000000 +0000
+@@ -493,7 +493,7 @@
+ * unified cache on the SH-2 and SH-3, as well as the harvard
+ * style cache on the SH-4.
+ */
+- if (test_bit(SH_CACHE_COMBINED, &(boot_cpu_data.icache.flags))) {
++ if (boot_cpu_data.icache.flags & SH_CACHE_COMBINED) {
+ seq_printf(m, "unified\n");
+ show_cacheinfo(m, "cache", boot_cpu_data.icache);
+ } else {
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-07 10:17:07.000000000 +0000
-@@ -28,7 +28,6 @@
++++ linux-2.6.17/arch/sh/kernel/sh_ksyms.c 2006-07-12 16:54:22.000000000 +0000
+@@ -28,21 +28,11 @@
/* platform dependent support */
EXPORT_SYMBOL(dump_fpu);
-EXPORT_SYMBOL(iounmap);
- EXPORT_SYMBOL(enable_irq);
- EXPORT_SYMBOL(disable_irq);
- EXPORT_SYMBOL(probe_irq_mask);
-@@ -101,6 +100,7 @@
+-EXPORT_SYMBOL(enable_irq);
+-EXPORT_SYMBOL(disable_irq);
+-EXPORT_SYMBOL(probe_irq_mask);
+ EXPORT_SYMBOL(kernel_thread);
+-EXPORT_SYMBOL(disable_irq_nosync);
+ EXPORT_SYMBOL(irq_desc);
+ EXPORT_SYMBOL(no_irq_type);
+
+-EXPORT_SYMBOL(strstr);
+ EXPORT_SYMBOL(strlen);
+-EXPORT_SYMBOL(strnlen);
+-EXPORT_SYMBOL(strchr);
+-EXPORT_SYMBOL(strcat);
+-EXPORT_SYMBOL(strncat);
+
+ /* PCI exports */
+ #ifdef CONFIG_PCI
+@@ -53,13 +43,8 @@
+ /* mem exports */
+ EXPORT_SYMBOL(memchr);
+ EXPORT_SYMBOL(memcpy);
+-EXPORT_SYMBOL(memcpy_fromio);
+-EXPORT_SYMBOL(memcpy_toio);
+ EXPORT_SYMBOL(memset);
+-EXPORT_SYMBOL(memset_io);
+ EXPORT_SYMBOL(memmove);
+-EXPORT_SYMBOL(memcmp);
+-EXPORT_SYMBOL(memscan);
+ EXPORT_SYMBOL(__copy_user);
+ EXPORT_SYMBOL(boot_cpu_data);
+
+@@ -101,6 +86,7 @@
EXPORT_SYMBOL(flush_cache_range);
EXPORT_SYMBOL(flush_dcache_page);
EXPORT_SYMBOL(__flush_purge_region);
@@ -34610,7 +34819,7 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/sh_ksyms.c linux-2.6.17/arch/sh/ke
#endif
#if defined(CONFIG_SH7705_CACHE_32KB)
-@@ -117,7 +117,13 @@
+@@ -117,7 +103,12 @@
EXPORT_SYMBOL(synchronize_irq);
#endif
@@ -34621,12 +34830,12 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/sh_ksyms.c linux-2.6.17/arch/sh/ke
EXPORT_SYMBOL(csum_partial);
+#ifdef CONFIG_IPV6
EXPORT_SYMBOL(csum_ipv6_magic);
+-EXPORT_SYMBOL(consistent_sync);
+#endif
- EXPORT_SYMBOL(consistent_sync);
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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/sys_sh.c 2006-07-12 16:54:22.000000000 +0000
@@ -21,7 +21,7 @@
#include <linux/mman.h>
#include <linux/file.h>
@@ -34638,7 +34847,7 @@ 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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/syscalls.S 2006-07-12 16:54:22.000000000 +0000
@@ -0,0 +1,354 @@
+/*
+ * arch/sh/kernel/syscalls.S
@@ -34996,7 +35205,32 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/syscalls.S linux-2.6.17/arch/sh/ke
+ .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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/time.c 2006-07-12 16:54:22.000000000 +0000
+@@ -30,11 +30,11 @@
+ /* XXX: Can we initialize this in a routine somewhere? Dreamcast doesn't want
+ * these routines anywhere... */
+ #ifdef CONFIG_SH_RTC
+-void (*rtc_get_time)(struct timespec *) = sh_rtc_gettimeofday;
+-int (*rtc_set_time)(const time_t) = sh_rtc_settimeofday;
++void (*rtc_sh_get_time)(struct timespec *) = sh_rtc_gettimeofday;
++int (*rtc_sh_set_time)(const time_t) = sh_rtc_settimeofday;
+ #else
+-void (*rtc_get_time)(struct timespec *);
+-int (*rtc_set_time)(const time_t);
++void (*rtc_sh_get_time)(struct timespec *);
++int (*rtc_sh_set_time)(const time_t);
+ #endif
+
+ /*
+@@ -136,7 +136,7 @@
+ xtime.tv_sec > last_rtc_update + 660 &&
+ (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 &&
+ (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) {
+- if (rtc_set_time(xtime.tv_sec) == 0)
++ if (rtc_sh_set_time(xtime.tv_sec) == 0)
+ last_rtc_update = xtime.tv_sec;
+ else
+ /* do it again in 60s */
@@ -144,8 +144,33 @@
}
}
@@ -35031,27 +35265,59 @@ 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)
+@@ -169,8 +194,8 @@
+
+ clk_init();
+
+- if (rtc_get_time) {
+- rtc_get_time(&xtime);
++ if (rtc_sh_get_time) {
++ rtc_sh_get_time(&xtime);
+ } else {
+ xtime.tv_sec = mktime(2000, 1, 1, 0, 0, 0);
+ xtime.tv_nsec = 0;
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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/timers/CVS/Entries 2006-07-12 16:54:22.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/
+/timer.c/1.1/Sat Mar 26 20:25:36 2005/-ko/
++/timer-tmu.c/1.4/Sat Jul 8 20:16:10 2006/-ko/
+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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/timers/CVS/Repository 2006-07-12 16:54:22.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/timers/CVS/Root 2006-07-12 16:54:22.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/timers/timer-tmu.c 2006-07-12 16:54:22.000000000 +0000
+@@ -132,17 +132,17 @@
+ ctrl_outl(0xffffffff, TMU0_TCOR);
+ ctrl_outl(0xffffffff, TMU0_TCNT);
+
+- rtc_get_time(&ts2);
++ rtc_sh_get_time(&ts2);
+
+ do {
+- rtc_get_time(&ts1);
++ rtc_sh_get_time(&ts1);
+ } while (ts1.tv_nsec == ts2.tv_nsec && ts1.tv_sec == ts2.tv_sec);
+
+ /* actually start the timer */
+ ctrl_outb(TMU_TSTR_INIT, TMU_TSTR);
+
+ do {
+- rtc_get_time(&ts2);
++ rtc_sh_get_time(&ts2);
+ } while (ts1.tv_nsec == ts2.tv_nsec && ts1.tv_sec == ts2.tv_sec);
+
+ freq = 0xffffffff - ctrl_inl(TMU0_TCNT);
@@ -188,6 +188,18 @@
.ops = &tmu_clk_ops,
};
@@ -35099,8 +35365,53 @@ 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-07 10:17:07.000000000 +0000
-@@ -87,7 +87,7 @@
++++ linux-2.6.17/arch/sh/kernel/traps.c 2006-07-12 16:54:22.000000000 +0000
+@@ -37,40 +37,15 @@
+
+ #ifdef CONFIG_SH_KGDB
+ #include <asm/kgdb.h>
+-#define CHK_REMOTE_DEBUG(regs) \
+-{ \
+- if ((kgdb_debug_hook != (kgdb_debug_hook_t *) NULL) && (!user_mode(regs))) \
+- { \
+- (*kgdb_debug_hook)(regs); \
+- } \
++#define CHK_REMOTE_DEBUG(regs) \
++{ \
++ if (kgdb_debug_hook && !user_mode(regs))\
++ (*kgdb_debug_hook)(regs); \
+ }
+ #else
+ #define CHK_REMOTE_DEBUG(regs)
+ #endif
+
+-#define DO_ERROR(trapnr, signr, str, name, tsk) \
+-asmlinkage void do_##name(unsigned long r4, unsigned long r5, \
+- unsigned long r6, unsigned long r7, \
+- struct pt_regs regs) \
+-{ \
+- unsigned long error_code; \
+- \
+- /* Check if it's a DSP instruction */ \
+- if (is_dsp_inst(&regs)) { \
+- /* Enable DSP mode, and restart instruction. */ \
+- regs.sr |= SR_DSP; \
+- return; \
+- } \
+- \
+- asm volatile("stc r2_bank, %0": "=r" (error_code)); \
+- local_irq_enable(); \
+- tsk->thread.error_code = error_code; \
+- tsk->thread.trap_no = trapnr; \
+- CHK_REMOTE_DEBUG(&regs); \
+- force_sig(signr, tsk); \
+- die_if_no_fixup(str,&regs,error_code); \
+-}
+-
+ #ifdef CONFIG_CPU_SH2
+ #define TRAP_RESERVED_INST 4
+ #define TRAP_ILLEGAL_SLOT_INST 6
+@@ -87,7 +62,7 @@
#define VMALLOC_OFFSET (8*1024*1024)
#define MODULE_RANGE (8*1024*1024)
@@ -35109,9 +35420,154 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/kernel/traps.c linux-2.6.17/arch/sh/kerne
void die(const char * str, struct pt_regs * regs, long err)
{
+@@ -576,8 +551,117 @@
+ #define is_dsp_inst(regs) (0)
+ #endif /* CONFIG_SH_DSP */
+
+-DO_ERROR(TRAP_RESERVED_INST, SIGILL, "reserved instruction", reserved_inst, current)
+-DO_ERROR(TRAP_ILLEGAL_SLOT_INST, SIGILL, "illegal slot instruction", illegal_slot_inst, current)
++extern int do_fpu_inst(unsigned short, struct pt_regs*);
++
++asmlinkage void do_reserved_inst(unsigned long r4, unsigned long r5,
++ unsigned long r6, unsigned long r7,
++ struct pt_regs regs)
++{
++ unsigned long error_code;
++ struct task_struct *tsk = current;
++
++#ifdef CONFIG_SH_FPU_EMU
++ unsigned short inst;
++ int err;
++
++ get_user(inst, (unsigned short*)regs.pc);
++
++ err = do_fpu_inst(inst, &regs);
++ if (!err) {
++ regs.pc += 2;
++ return;
++ }
++ /* not a FPU inst. */
++#endif
++
++#ifdef CONFIG_SH_DSP
++ /* Check if it's a DSP instruction */
++ if (is_dsp_inst(&regs)) {
++ /* Enable DSP mode, and restart instruction. */
++ regs.sr |= SR_DSP;
++ return;
++ }
++#endif
++
++ asm volatile("stc r2_bank, %0": "=r" (error_code));
++ local_irq_enable();
++ tsk->thread.error_code = error_code;
++ tsk->thread.trap_no = TRAP_RESERVED_INST;
++ CHK_REMOTE_DEBUG(&regs);
++ force_sig(SIGILL, tsk);
++ die_if_no_fixup("reserved instruction", &regs, error_code);
++}
++
++#ifdef CONFIG_SH_FPU_EMU
++static int emulate_branch(unsigned short inst, struct pt_regs* regs)
++{
++ /*
++ * bfs: 8fxx: PC+=d*2+4;
++ * bts: 8dxx: PC+=d*2+4;
++ * bra: axxx: PC+=D*2+4;
++ * bsr: bxxx: PC+=D*2+4 after PR=PC+4;
++ * braf:0x23: PC+=Rn*2+4;
++ * bsrf:0x03: PC+=Rn*2+4 after PR=PC+4;
++ * jmp: 4x2b: PC=Rn;
++ * jsr: 4x0b: PC=Rn after PR=PC+4;
++ * rts: 000b: PC=PR;
++ */
++ if ((inst & 0xfd00) == 0x8d00) {
++ regs->pc += SH_PC_8BIT_OFFSET(inst);
++ return 0;
++ }
++
++ if ((inst & 0xe000) == 0xa000) {
++ regs->pc += SH_PC_12BIT_OFFSET(inst);
++ return 0;
++ }
++
++ if ((inst & 0xf0df) == 0x0003) {
++ regs->pc += regs->regs[(inst & 0x0f00) >> 8] + 4;
++ return 0;
++ }
++
++ if ((inst & 0xf0df) == 0x400b) {
++ regs->pc = regs->regs[(inst & 0x0f00) >> 8];
++ return 0;
++ }
++
++ if ((inst & 0xffff) == 0x000b) {
++ regs->pc = regs->pr;
++ return 0;
++ }
++
++ return 1;
++}
++#endif
++
++asmlinkage void do_illegal_slot_inst(unsigned long r4, unsigned long r5,
++ unsigned long r6, unsigned long r7,
++ struct pt_regs regs)
++{
++ unsigned long error_code;
++ struct task_struct *tsk = current;
++#ifdef CONFIG_SH_FPU_EMU
++ unsigned short inst;
++
++ get_user(inst, (unsigned short *)regs.pc + 1);
++ if (!do_fpu_inst(inst, &regs)) {
++ get_user(inst, (unsigned short *)regs.pc);
++ if (!emulate_branch(inst, &regs))
++ return;
++ /* fault in branch.*/
++ }
++ /* not a FPU inst. */
++#endif
++
++ asm volatile("stc r2_bank, %0": "=r" (error_code));
++ local_irq_enable();
++ tsk->thread.error_code = error_code;
++ tsk->thread.trap_no = TRAP_RESERVED_INST;
++ CHK_REMOTE_DEBUG(&regs);
++ force_sig(SIGILL, tsk);
++ die_if_no_fixup("illegal slot instruction", &regs, error_code);
++}
+
+ asmlinkage void do_exception_error(unsigned long r4, unsigned long r5,
+ unsigned long r6, unsigned long r7,
+@@ -635,14 +719,16 @@
+ exception_handling_table[TRAP_ILLEGAL_SLOT_INST]
+ = (void *)do_illegal_slot_inst;
+
+-#ifdef CONFIG_CPU_SH4
+- if (!(cpu_data->flags & CPU_HAS_FPU)) {
+- /* For SH-4 lacking an FPU, treat floating point instructions
+- as reserved. */
+- /* entry 64 corresponds to EXPEVT=0x800 */
+- exception_handling_table[64] = (void *)do_reserved_inst;
+- exception_handling_table[65] = (void *)do_illegal_slot_inst;
+- }
++#if defined(CONFIG_CPU_SH4) && !defined(CONFIG_SH_FPU) || \
++ defined(CONFIG_SH_FPU_EMU)
++ /*
++ * For SH-4 lacking an FPU, treat floating point instructions as
++ * reserved. They'll be handled in the math-emu case, or faulted on
++ * otherwise.
++ */
++ /* entry 64 corresponds to EXPEVT=0x800 */
++ exception_handling_table[64] = (void *)do_reserved_inst;
++ exception_handling_table[65] = (void *)do_illegal_slot_inst;
+ #endif
+
+ /* Setup VBR for boot cpu */
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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/kernel/vmlinux.lds.S 2006-07-12 16:54:22.000000000 +0000
@@ -63,8 +63,6 @@
. = ALIGN(8192); /* init_task */
@@ -35123,7 +35579,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/lib/CVS/Entries 2006-07-12 16:54:22.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/
@@ -35140,17 +35596,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/lib/CVS/Repository 2006-07-12 16:54:22.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/lib/CVS/Root 2006-07-12 16:54:22.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/lib/checksum.S 2006-07-12 16:54:22.000000000 +0000
@@ -202,8 +202,9 @@
cmp/pz r6 ! Jump if we had at least two bytes.
bt/s 1f
@@ -35164,7 +35620,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/lib/memcpy-sh4.S 2006-07-12 16:54:22.000000000 +0000
@@ -20,7 +20,7 @@
!
! GHIJ KLMN OPQR --> ...G HIJK LMNO PQR.
@@ -35571,7 +36027,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/lib/memmove.S 2006-07-12 16:54:22.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 $
@@ -35580,7 +36036,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/lib/memset.S 2006-07-12 16:54:23.000000000 +0000
@@ -29,6 +29,7 @@
bf/s 1b
mov.b r5,@-r4
@@ -35589,9 +36045,736 @@ diff -ruN linux-2.6.17-vanilla/arch/sh/lib/memset.S linux-2.6.17/arch/sh/lib/mem
swap.b r5,r0 ! V0
or r0,r5 ! VV
swap.w r5,r0 ! VV00
+diff -ruN linux-2.6.17-vanilla/arch/sh/math-emu/CVS/Entries linux-2.6.17/arch/sh/math-emu/CVS/Entries
+--- linux-2.6.17-vanilla/arch/sh/math-emu/CVS/Entries 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.17/arch/sh/math-emu/CVS/Entries 2006-07-12 16:54:23.000000000 +0000
+@@ -0,0 +1,4 @@
++/Makefile/1.1/Wed Jul 12 10:35:55 2006/-ko/
++/math.c/1.1/Wed Jul 12 10:35:55 2006/-ko/
++/sfp-util.h/1.1/Wed Jul 12 10:35:55 2006/-ko/
++D
+diff -ruN linux-2.6.17-vanilla/arch/sh/math-emu/CVS/Repository linux-2.6.17/arch/sh/math-emu/CVS/Repository
+--- linux-2.6.17-vanilla/arch/sh/math-emu/CVS/Repository 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.17/arch/sh/math-emu/CVS/Repository 2006-07-12 16:54:23.000000000 +0000
+@@ -0,0 +1 @@
++linux/arch/sh/math-emu
+diff -ruN linux-2.6.17-vanilla/arch/sh/math-emu/CVS/Root linux-2.6.17/arch/sh/math-emu/CVS/Root
+--- linux-2.6.17-vanilla/arch/sh/math-emu/CVS/Root 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.17/arch/sh/math-emu/CVS/Root 2006-07-12 16:54:23.000000000 +0000
+@@ -0,0 +1 @@
++:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh
+diff -ruN linux-2.6.17-vanilla/arch/sh/math-emu/Makefile linux-2.6.17/arch/sh/math-emu/Makefile
+--- linux-2.6.17-vanilla/arch/sh/math-emu/Makefile 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.17/arch/sh/math-emu/Makefile 2006-07-12 16:54:23.000000000 +0000
+@@ -0,0 +1 @@
++obj-y := math.o
+diff -ruN linux-2.6.17-vanilla/arch/sh/math-emu/math.c linux-2.6.17/arch/sh/math-emu/math.c
+--- linux-2.6.17-vanilla/arch/sh/math-emu/math.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.17/arch/sh/math-emu/math.c 2006-07-12 16:54:23.000000000 +0000
+@@ -0,0 +1,624 @@
++/*
++ * arch/sh/math-emu/math.c
++ *
++ * Copyright (C) 2006 Takashi YOSHII <takasi-y@ops.dti.ne.jp>
++ *
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License. See the file "COPYING" in the main directory of this archive
++ * for more details.
++ */
++#include <linux/config.h>
++#include <linux/kernel.h>
++#include <linux/errno.h>
++#include <linux/types.h>
++#include <linux/sched.h>
++#include <linux/signal.h>
++
++#include <asm/system.h>
++#include <asm/uaccess.h>
++#include <asm/processor.h>
++#include <asm/io.h>
++
++#include "sfp-util.h"
++#include <math-emu/soft-fp.h>
++#include <math-emu/single.h>
++#include <math-emu/double.h>
++
++#define FPUL (fregs->fpul)
++#define FPSCR (fregs->fpscr)
++#define FPSCR_RM (FPSCR&3)
++#define FPSCR_DN ((FPSCR>>18)&1)
++#define FPSCR_PR ((FPSCR>>19)&1)
++#define FPSCR_SZ ((FPSCR>>20)&1)
++#define FPSCR_FR ((FPSCR>>21)&1)
++#define FPSCR_MASK 0x003fffffUL
++
++#define BANK(n) (n^(FPSCR_FR?16:0))
++#define FR ((unsigned long*)(fregs->fp_regs))
++#define FR0 (FR[BANK(0)])
++#define FRn (FR[BANK(n)])
++#define FRm (FR[BANK(m)])
++#define DR ((unsigned long long*)(fregs->fp_regs))
++#define DRn (DR[BANK(n)/2])
++#define DRm (DR[BANK(m)/2])
++
++#define XREG(n) (n^16)
++#define XFn (FR[BANK(XREG(n))])
++#define XFm (FR[BANK(XREG(m))])
++#define XDn (DR[BANK(XREG(n))/2])
++#define XDm (DR[BANK(XREG(m))/2])
++
++#define R0 (regs->regs[0])
++#define Rn (regs->regs[n])
++#define Rm (regs->regs[m])
++
++#define WRITE(d,a) ({if(put_user(d, (typeof (d)*)a)) return -EFAULT;})
++#define READ(d,a) ({if(get_user(d, (typeof (d)*)a)) return -EFAULT;})
++
++#define PACK_S(r,f) FP_PACK_SP(&r,f)
++#define UNPACK_S(f,r) FP_UNPACK_SP(f,&r)
++#define PACK_D(r,f) \
++ {u32 t[2]; FP_PACK_DP(t,f); ((u32*)&r)[0]=t[1]; ((u32*)&r)[1]=t[0];}
++#define UNPACK_D(f,r) \
++ {u32 t[2]; t[0]=((u32*)&r)[1]; t[1]=((u32*)&r)[0]; FP_UNPACK_DP(f,t);}
++
++// 2 args instructions.
++#define BOTH_PRmn(op,x) \
++ FP_DECL_EX; if(FPSCR_PR) op(D,x,DRm,DRn); else op(S,x,FRm,FRn);
++
++#define CMP_X(SZ,R,M,N) do{ \
++ FP_DECL_##SZ(Fm); FP_DECL_##SZ(Fn); \
++ UNPACK_##SZ(Fm, M); UNPACK_##SZ(Fn, N); \
++ FP_CMP_##SZ(R, Fn, Fm, 2); }while(0)
++#define EQ_X(SZ,R,M,N) do{ \
++ FP_DECL_##SZ(Fm); FP_DECL_##SZ(Fn); \
++ UNPACK_##SZ(Fm, M); UNPACK_##SZ(Fn, N); \
++ FP_CMP_EQ_##SZ(R, Fn, Fm); }while(0)
++#define CMP(OP) ({ int r; BOTH_PRmn(OP##_X,r); r; })
++
++static int
++fcmp_gt(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m, int n)
++{
++ if (CMP(CMP) > 0)
++ regs->sr |= 1;
++ else
++ regs->sr &= ~1;
++
++ return 0;
++}
++
++static int
++fcmp_eq(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m, int n)
++{
++ if (CMP(CMP /*EQ*/) == 0)
++ regs->sr |= 1;
++ else
++ regs->sr &= ~1;
++ return 0;
++}
++
++#define ARITH_X(SZ,OP,M,N) do{ \
++ FP_DECL_##SZ(Fm); FP_DECL_##SZ(Fn); FP_DECL_##SZ(Fr); \
++ UNPACK_##SZ(Fm, M); UNPACK_##SZ(Fn, N); \
++ FP_##OP##_##SZ(Fr, Fn, Fm); \
++ PACK_##SZ(N, Fr); }while(0)
++
++static int
++fadd(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m, int n)
++{
++ BOTH_PRmn(ARITH_X, ADD);
++ return 0;
++}
++
++static int
++fsub(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m, int n)
++{
++ BOTH_PRmn(ARITH_X, SUB);
++ return 0;
++}
++
++static int
++fmul(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m, int n)
++{
++ BOTH_PRmn(ARITH_X, MUL);
++ return 0;
++}
++
++static int
++fdiv(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m, int n)
++{
++ BOTH_PRmn(ARITH_X, DIV);
++ return 0;
++}
++
++static int
++fmac(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m, int n)
++{
++ FP_DECL_EX;
++ FP_DECL_S(Fr);
++ FP_DECL_S(Ft);
++ FP_DECL_S(F0);
++ FP_DECL_S(Fm);
++ FP_DECL_S(Fn);
++ UNPACK_S(F0, FR0);
++ UNPACK_S(Fm, FRm);
++ UNPACK_S(Fn, FRn);
++ FP_MUL_S(Ft, Fm, F0);
++ FP_ADD_S(Fr, Fn, Ft);
++ PACK_S(FRn, Fr);
++ return 0;
++}
++
++// to process fmov's extention (odd n for DR access XD).
++#define FMOV_EXT(x) if(x&1) x+=16-1
++
++static int
++fmov_idx_reg(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m,
++ int n)
++{
++ if (FPSCR_SZ) {
++ FMOV_EXT(n);
++ READ(FRn, Rm + R0 + 4);
++ n++;
++ READ(FRn, Rm + R0);
++ } else {
++ READ(FRn, Rm + R0);
++ }
++
++ return 0;
++}
++
++static int
++fmov_mem_reg(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m,
++ int n)
++{
++ if (FPSCR_SZ) {
++ FMOV_EXT(n);
++ READ(FRn, Rm + 4);
++ n++;
++ READ(FRn, Rm);
++ } else {
++ READ(FRn, Rm);
++ }
++
++ return 0;
++}
++
++static int
++fmov_inc_reg(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m,
++ int n)
++{
++ if (FPSCR_SZ) {
++ FMOV_EXT(n);
++ READ(FRn, Rm + 4);
++ n++;
++ READ(FRn, Rm);
++ Rm += 8;
++ } else {
++ READ(FRn, Rm);
++ Rm += 4;
++ }
++
++ return 0;
++}
++
++static int
++fmov_reg_idx(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m,
++ int n)
++{
++ if (FPSCR_SZ) {
++ FMOV_EXT(m);
++ WRITE(FRm, Rn + R0 + 4);
++ m++;
++ WRITE(FRm, Rn + R0);
++ } else {
++ WRITE(FRm, Rn + R0);
++ }
++
++ return 0;
++}
++
++static int
++fmov_reg_mem(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m,
++ int n)
++{
++ if (FPSCR_SZ) {
++ FMOV_EXT(m);
++ WRITE(FRm, Rn + 4);
++ m++;
++ WRITE(FRm, Rn);
++ } else {
++ WRITE(FRm, Rn);
++ }
++
++ return 0;
++}
++
++static int
++fmov_reg_dec(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m,
++ int n)
++{
++ if (FPSCR_SZ) {
++ FMOV_EXT(m);
++ Rn -= 8;
++ WRITE(FRm, Rn + 4);
++ m++;
++ WRITE(FRm, Rn);
++ } else {
++ Rn -= 4;
++ WRITE(FRm, Rn);
++ }
++
++ return 0;
++}
++
++static int
++fmov_reg_reg(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m,
++ int n)
++{
++ if (FPSCR_SZ) {
++ FMOV_EXT(m);
++ FMOV_EXT(n);
++ DRn = DRm;
++ } else {
++ FRn = FRm;
++ }
++
++ return 0;
++}
++
++static int
++fnop_mn(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int m, int n)
++{
++ return -EINVAL;
++}
++
++// 1 arg instructions.
++#define NOTYETn(i) static int i(struct sh_fpu_soft_struct *fregs, int n) \
++ { printk( #i " not yet done.\n"); return 0; }
++
++NOTYETn(ftrv)
++NOTYETn(fsqrt)
++NOTYETn(fipr)
++NOTYETn(fsca)
++NOTYETn(fsrra)
++
++#define EMU_FLOAT_X(SZ,N) do { \
++ FP_DECL_##SZ(Fn); \
++ FP_FROM_INT_##SZ(Fn, FPUL, 32, int); \
++ PACK_##SZ(N, Fn); }while(0)
++static int ffloat(struct sh_fpu_soft_struct *fregs, int n)
++{
++ FP_DECL_EX;
++
++ if (FPSCR_PR)
++ EMU_FLOAT_X(D, DRn);
++ else
++ EMU_FLOAT_X(S, FRn);
++
++ return 0;
++}
++
++#define EMU_FTRC_X(SZ,N) do { \
++ FP_DECL_##SZ(Fn); \
++ UNPACK_##SZ(Fn, N); \
++ FP_TO_INT_##SZ(FPUL, Fn, 32, 1); }while(0)
++static int ftrc(struct sh_fpu_soft_struct *fregs, int n)
++{
++ FP_DECL_EX;
++
++ if (FPSCR_PR)
++ EMU_FTRC_X(D, DRn);
++ else
++ EMU_FTRC_X(S, FRn);
++
++ return 0;
++}
++
++static int fcnvsd(struct sh_fpu_soft_struct *fregs, int n)
++{
++ FP_DECL_EX;
++ FP_DECL_S(Fn);
++ FP_DECL_D(Fr);
++ UNPACK_S(Fn, FPUL);
++ FP_CONV(D, S, 2, 1, Fr, Fn);
++ PACK_D(DRn, Fr);
++ return 0;
++}
++
++static int fcnvds(struct sh_fpu_soft_struct *fregs, int n)
++{
++ FP_DECL_EX;
++ FP_DECL_D(Fn);
++ FP_DECL_S(Fr);
++ UNPACK_D(Fn, DRn);
++ FP_CONV(S, D, 1, 2, Fr, Fn);
++ PACK_S(FPUL, Fr);
++ return 0;
++}
++
++static int fxchg(struct sh_fpu_soft_struct *fregs, int flag)
++{
++ FPSCR ^= flag;
++ return 0;
++}
++
++static int fsts(struct sh_fpu_soft_struct *fregs, int n)
++{
++ FRn = FPUL;
++ return 0;
++}
++
++static int flds(struct sh_fpu_soft_struct *fregs, int n)
++{
++ FPUL = FRn;
++ return 0;
++}
++
++static int fneg(struct sh_fpu_soft_struct *fregs, int n)
++{
++ FRn ^= (1 << (_FP_W_TYPE_SIZE - 1));
++ return 0;
++}
++
++static int fabs(struct sh_fpu_soft_struct *fregs, int n)
++{
++ FRn &= ~(1 << (_FP_W_TYPE_SIZE - 1));
++ return 0;
++}
++
++static int fld0(struct sh_fpu_soft_struct *fregs, int n)
++{
++ FRn = 0;
++ return 0;
++}
++
++static int fld1(struct sh_fpu_soft_struct *fregs, int n)
++{
++ FRn = (_FP_EXPBIAS_S << (_FP_FRACBITS_S - 1));
++ return 0;
++}
++
++static int fnop_n(struct sh_fpu_soft_struct *fregs, int n)
++{
++ return -EINVAL;
++}
++
++/// Instruction decoders.
++
++static int id_fxfd(struct sh_fpu_soft_struct *, int);
++static int id_fnxd(struct sh_fpu_soft_struct *, struct pt_regs *, int, int);
++
++static int (*fnxd[])(struct sh_fpu_soft_struct *, int) = {
++ fsts, flds, ffloat, ftrc, fneg, fabs, fsqrt, fsrra,
++ fld0, fld1, fcnvsd, fcnvds, fnop_n, fnop_n, fipr, id_fxfd
++};
++
++static int (*fnmx[])(struct sh_fpu_soft_struct *, struct pt_regs *, int, int) = {
++ fadd, fsub, fmul, fdiv, fcmp_eq, fcmp_gt, fmov_idx_reg, fmov_reg_idx,
++ fmov_mem_reg, fmov_inc_reg, fmov_reg_mem, fmov_reg_dec,
++ fmov_reg_reg, id_fnxd, fmac, fnop_mn};
++
++static int id_fxfd(struct sh_fpu_soft_struct *fregs, int x)
++{
++ const int flag[] = { FPSCR_SZ, FPSCR_PR, FPSCR_FR, 0 };
++ switch (x & 3) {
++ case 3:
++ fxchg(fregs, flag[x >> 2]);
++ break;
++ case 1:
++ ftrv(fregs, x - 1);
++ break;
++ default:
++ fsca(fregs, x);
++ }
++ return 0;
++}
++
++static int
++id_fnxd(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, int x, int n)
++{
++ return (fnxd[x])(fregs, n);
++}
++
++static int
++id_fnmx(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, u16 code)
++{
++ int n = (code >> 8) & 0xf, m = (code >> 4) & 0xf, x = code & 0xf;
++ return (fnmx[x])(fregs, regs, m, n);
++}
++
++static int
++id_sys(struct sh_fpu_soft_struct *fregs, struct pt_regs *regs, u16 code)
++{
++ int n = ((code >> 8) & 0xf);
++ unsigned long *reg = (code & 0x0010) ? &FPUL : &FPSCR;
++
++ switch (code & 0xf0ff) {
++ case 0x005a:
++ case 0x006a:
++ Rn = *reg;
++ break;
++ case 0x405a:
++ case 0x406a:
++ *reg = Rn;
++ break;
++ case 0x4052:
++ case 0x4062:
++ Rn -= 4;
++ WRITE(*reg, Rn);
++ break;
++ case 0x4056:
++ case 0x4066:
++ READ(*reg, Rn);
++ Rn += 4;
++ break;
++ default:
++ return -EINVAL;
++ }
++
++ return 0;
++}
++
++static int fpu_emulate(u16 code, struct sh_fpu_soft_struct *fregs, struct pt_regs *regs)
++{
++ if ((code & 0xf000) == 0xf000)
++ return id_fnmx(fregs, regs, code);
++ else
++ return id_sys(fregs, regs, code);
++}
++
++/**
++ * denormal_to_double - Given denormalized float number,
++ * store double float
++ *
++ * @fpu: Pointer to sh_fpu_hard structure
++ * @n: Index to FP register
++ */
++static void denormal_to_double(struct sh_fpu_hard_struct *fpu, int n)
++{
++ unsigned long du, dl;
++ unsigned long x = fpu->fpul;
++ int exp = 1023 - 126;
++
++ if (x != 0 && (x & 0x7f800000) == 0) {
++ du = (x & 0x80000000);
++ while ((x & 0x00800000) == 0) {
++ x <<= 1;
++ exp--;
++ }
++ x &= 0x007fffff;
++ du |= (exp << 20) | (x >> 3);
++ dl = x << 29;
++
++ fpu->fp_regs[n] = du;
++ fpu->fp_regs[n+1] = dl;
++ }
++}
++
++/**
++ * ieee_fpe_handler - Handle denormalized number exception
++ *
++ * @regs: Pointer to register structure
++ *
++ * Returns 1 when it's handled (should not cause exception).
++ */
++static int ieee_fpe_handler(struct pt_regs *regs)
++{
++ unsigned short insn = *(unsigned short *)regs->pc;
++ unsigned short finsn;
++ unsigned long nextpc;
++ int nib[4] = {
++ (insn >> 12) & 0xf,
++ (insn >> 8) & 0xf,
++ (insn >> 4) & 0xf,
++ insn & 0xf};
++
++ if (nib[0] == 0xb ||
++ (nib[0] == 0x4 && nib[2] == 0x0 && nib[3] == 0xb)) /* bsr & jsr */
++ regs->pr = regs->pc + 4;
++
++ if (nib[0] == 0xa || nib[0] == 0xb) { /* bra & bsr */
++ nextpc = regs->pc + 4 + ((short) ((insn & 0xfff) << 4) >> 3);
++ finsn = *(unsigned short *) (regs->pc + 2);
++ } else if (nib[0] == 0x8 && nib[1] == 0xd) { /* bt/s */
++ if (regs->sr & 1)
++ nextpc = regs->pc + 4 + ((char) (insn & 0xff) << 1);
++ else
++ nextpc = regs->pc + 4;
++ finsn = *(unsigned short *) (regs->pc + 2);
++ } else if (nib[0] == 0x8 && nib[1] == 0xf) { /* bf/s */
++ if (regs->sr & 1)
++ nextpc = regs->pc + 4;
++ else
++ nextpc = regs->pc + 4 + ((char) (insn & 0xff) << 1);
++ finsn = *(unsigned short *) (regs->pc + 2);
++ } else if (nib[0] == 0x4 && nib[3] == 0xb &&
++ (nib[2] == 0x0 || nib[2] == 0x2)) { /* jmp & jsr */
++ nextpc = regs->regs[nib[1]];
++ finsn = *(unsigned short *) (regs->pc + 2);
++ } else if (nib[0] == 0x0 && nib[3] == 0x3 &&
++ (nib[2] == 0x0 || nib[2] == 0x2)) { /* braf & bsrf */
++ nextpc = regs->pc + 4 + regs->regs[nib[1]];
++ finsn = *(unsigned short *) (regs->pc + 2);
++ } else if (insn == 0x000b) { /* rts */
++ nextpc = regs->pr;
++ finsn = *(unsigned short *) (regs->pc + 2);
++ } else {
++ nextpc = regs->pc + 2;
++ finsn = insn;
++ }
++
++ if ((finsn & 0xf1ff) == 0xf0ad) { /* fcnvsd */
++ struct task_struct *tsk = current;
++
++ if ((tsk->thread.fpu.hard.fpscr & (1 << 17))) {
++ /* FPU error */
++ denormal_to_double (&tsk->thread.fpu.hard,
++ (finsn >> 8) & 0xf);
++ tsk->thread.fpu.hard.fpscr &=
++ ~(FPSCR_CAUSE_MASK | FPSCR_FLAG_MASK);
++ set_tsk_thread_flag(tsk, TIF_USEDFPU);
++ } else {
++ tsk->thread.trap_no = 11;
++ tsk->thread.error_code = 0;
++ force_sig(SIGFPE, tsk);
++ }
++
++ regs->pc = nextpc;
++ return 1;
++ }
++
++ return 0;
++}
++
++asmlinkage void do_fpu_error(unsigned long r4, unsigned long r5,
++ unsigned long r6, unsigned long r7,
++ struct pt_regs regs)
++{
++ struct task_struct *tsk = current;
++
++ if (ieee_fpe_handler (&regs))
++ return;
++
++ regs.pc += 2;
++ tsk->thread.trap_no = 11;
++ tsk->thread.error_code = 0;
++ force_sig(SIGFPE, tsk);
++}
++
++/**
++ * fpu_init - Initialize FPU registers
++ * @fpu: Pointer to software emulated FPU registers.
++ */
++static void fpu_init(struct sh_fpu_soft_struct *fpu)
++{
++ int i;
++
++ fpu->fpscr = FPSCR_INIT;
++ fpu->fpul = 0;
++
++ for (i = 0; i < 16; i++) {
++ fpu->fp_regs[i] = 0;
++ fpu->xfp_regs[i]= 0;
++ }
++}
++
++/**
++ * do_fpu_inst - Handle reserved instructions for FPU emulation
++ * @inst: instruction code.
++ * @regs: registers on stack.
++ */
++int do_fpu_inst(unsigned short inst, struct pt_regs *regs)
++{
++ struct task_struct *tsk = current;
++ struct sh_fpu_soft_struct *fpu = &(tsk->thread.fpu.soft);
++
++ if (!test_tsk_thread_flag(tsk, TIF_USEDFPU)) {
++ /* initialize once. */
++ fpu_init(fpu);
++ set_tsk_thread_flag(tsk, TIF_USEDFPU);
++ }
++
++ return fpu_emulate(inst, fpu, regs);
++}
+diff -ruN linux-2.6.17-vanilla/arch/sh/math-emu/sfp-util.h linux-2.6.17/arch/sh/math-emu/sfp-util.h
+--- linux-2.6.17-vanilla/arch/sh/math-emu/sfp-util.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.17/arch/sh/math-emu/sfp-util.h 2006-07-12 16:54:23.000000000 +0000
+@@ -0,0 +1,72 @@
++/*
++ * These are copied from glibc/stdlib/longlong.h
++ */
++
++#define add_ssaaaa(sh, sl, ah, al, bh, bl) \
++ do { \
++ UWtype __x; \
++ __x = (al) + (bl); \
++ (sh) = (ah) + (bh) + (__x < (al)); \
++ (sl) = __x; \
++ } while (0)
++
++#define sub_ddmmss(sh, sl, ah, al, bh, bl) \
++ do { \
++ UWtype __x; \
++ __x = (al) - (bl); \
++ (sh) = (ah) - (bh) - (__x > (al)); \
++ (sl) = __x; \
++ } while (0)
++
++#define umul_ppmm(w1, w0, u, v) \
++ __asm__ ("dmulu.l %2,%3\n\tsts macl,%1\n\tsts mach,%0" \
++ : "=r" ((u32)(w1)), "=r" ((u32)(w0)) \
++ : "r" ((u32)(u)), "r" ((u32)(v)) \
++ : "macl", "mach")
++
++#define __ll_B ((UWtype) 1 << (W_TYPE_SIZE / 2))
++#define __ll_lowpart(t) ((UWtype) (t) & (__ll_B - 1))
++#define __ll_highpart(t) ((UWtype) (t) >> (W_TYPE_SIZE / 2))
++
++#define udiv_qrnnd(q, r, n1, n0, d) \
++ do { \
++ UWtype __d1, __d0, __q1, __q0; \
++ UWtype __r1, __r0, __m; \
++ __d1 = __ll_highpart (d); \
++ __d0 = __ll_lowpart (d); \
++ \
++ __r1 = (n1) % __d1; \
++ __q1 = (n1) / __d1; \
++ __m = (UWtype) __q1 * __d0; \
++ __r1 = __r1 * __ll_B | __ll_highpart (n0); \
++ if (__r1 < __m) \
++ { \
++ __q1--, __r1 += (d); \
++ if (__r1 >= (d)) /* i.e. we didn't get carry when adding to __r1 */\
++ if (__r1 < __m) \
++ __q1--, __r1 += (d); \
++ } \
++ __r1 -= __m; \
++ \
++ __r0 = __r1 % __d1; \
++ __q0 = __r1 / __d1; \
++ __m = (UWtype) __q0 * __d0; \
++ __r0 = __r0 * __ll_B | __ll_lowpart (n0); \
++ if (__r0 < __m) \
++ { \
++ __q0--, __r0 += (d); \
++ if (__r0 >= (d)) \
++ if (__r0 < __m) \
++ __q0--, __r0 += (d); \
++ } \
++ __r0 -= __m; \
++ \
++ (q) = (UWtype) __q1 * __ll_B | __q0; \
++ (r) = __r0; \
++ } while (0)
++
++#define abort() return 0
++
++#define __BYTE_ORDER __LITTLE_ENDIAN
++
++
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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/mm/CVS/Entries 2006-07-12 16:54:23.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//
@@ -35620,17 +36803,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/mm/CVS/Repository 2006-07-12 16:54:23.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/mm/CVS/Root 2006-07-12 16:54:23.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/mm/Kconfig 2006-07-12 16:54:23.000000000 +0000
@@ -20,7 +20,6 @@
config CPU_SH4A
bool
@@ -35649,7 +36832,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/mm/Makefile 2006-07-12 16:54:23.000000000 +0000
@@ -12,14 +12,16 @@
obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
@@ -35673,7 +36856,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/mm/cache-sh4.c 2006-07-12 16:54:23.000000000 +0000
@@ -2,7 +2,7 @@
* arch/sh/mm/cache-sh4.c
*
@@ -36409,7 +37592,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/mm/clear_page.S 2006-07-12 16:54:23.000000000 +0000
@@ -194,102 +194,5 @@
nop
.L4096: .word 4096
@@ -36516,7 +37699,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/mm/consistent.c 2006-07-12 16:54:23.000000000 +0000
@@ -9,6 +9,8 @@
*/
#include <linux/mm.h>
@@ -36528,7 +37711,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/mm/fault.c 2006-07-12 16:54:23.000000000 +0000
@@ -1,33 +1,21 @@
-/* $Id: fault.c,v 1.14 2004/01/13 05:52:11 kkojima Exp $
+/*
@@ -36789,7 +37972,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/mm/hugetlbpage.c 2006-07-12 16:54:23.000000000 +0000
@@ -27,61 +27,41 @@
pte_t *huge_pte_alloc(struct mm_struct *mm, unsigned long addr)
{
@@ -36870,7 +38053,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/mm/init.c 2006-07-12 16:54:23.000000000 +0000
@@ -61,7 +61,7 @@
printk("Mem-info:\n");
@@ -36909,7 +38092,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/mm/ioremap.c 2006-07-12 16:54:23.000000000 +0000
@@ -15,6 +15,7 @@
#include <linux/vmalloc.h>
#include <linux/module.h>
@@ -36950,7 +38133,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/mm/pg-sh4.c 2006-07-12 16:54:23.000000000 +0000
@@ -2,7 +2,7 @@
* arch/sh/mm/pg-sh4.c
*
@@ -37019,7 +38202,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/mm/pmb.c 2006-07-12 16:54:23.000000000 +0000
@@ -0,0 +1,404 @@
+/*
+ * arch/sh/mm/pmb.c
@@ -37427,7 +38610,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/mm/tlb-flush.c 2006-07-12 16:54:23.000000000 +0000
@@ -0,0 +1,132 @@
+/*
+ * TLB flushing operations for SH with an MMU.
@@ -37563,7 +38746,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/mm/tlb-sh4.c 2006-07-12 16:54:23.000000000 +0000
@@ -36,7 +36,6 @@
unsigned long vpn;
struct page *page;
@@ -37589,7 +38772,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/oprofile/CVS/Entries 2006-07-12 16:54:23.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//
@@ -37598,17 +38781,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/oprofile/CVS/Repository 2006-07-12 16:54:23.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/oprofile/CVS/Root 2006-07-12 16:54:23.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/oprofile/Makefile 2006-07-12 16:54:23.000000000 +0000
@@ -7,7 +7,11 @@
timer_int.o )
@@ -37623,7 +38806,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/tools/CVS/Entries 2006-07-12 16:54:23.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/
@@ -37631,17 +38814,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/tools/CVS/Repository 2006-07-12 16:54:23.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/tools/CVS/Root 2006-07-12 16:54:23.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/arch/sh/tools/mach-types 2006-07-12 16:54:23.000000000 +0000
@@ -7,7 +7,7 @@
#
SE SH_SOLUTION_ENGINE
@@ -37662,8 +38845,8 @@ 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-07 10:17:07.000000000 +0000
-@@ -0,0 +1,11 @@
++++ linux-2.6.17/drivers/CVS/Entries 2006-07-12 16:54:23.000000000 +0000
+@@ -0,0 +1,12 @@
+D/char////
+D/i2c////
+D/ide////
@@ -37675,19 +38858,20 @@ diff -ruN linux-2.6.17-vanilla/drivers/CVS/Entries linux-2.6.17/drivers/CVS/Entr
+D/sh////
+D/usb////
+D/video////
++D/rtc////
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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/CVS/Repository 2006-07-12 16:54:23.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/CVS/Root 2006-07-12 16:54:23.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/char/CVS/Entries 2006-07-12 16:54:23.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/
@@ -37699,17 +38883,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/char/CVS/Repository 2006-07-12 16:54:23.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/char/CVS/Root 2006-07-12 16:54:23.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/char/Kconfig 2006-07-12 16:54:23.000000000 +0000
@@ -737,6 +737,22 @@
To compile this driver as a module, choose M here: the
module will be called rtc.
@@ -37735,7 +38919,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/char/Makefile 2006-07-12 16:54:23.000000000 +0000
@@ -67,6 +67,9 @@
obj-$(CONFIG_SGI_IP27_RTC) += ip27-rtc.o
obj-$(CONFIG_DS1302) += ds1302.o
@@ -37748,7 +38932,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/char/rs5c313_rtc.c 2006-07-12 16:54:23.000000000 +0000
@@ -0,0 +1,855 @@
+/*
+ * RICHO RS5C313 Real Time Clock interface for Linux
@@ -38607,7 +39791,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/char/rtc.c 2006-07-12 16:54:23.000000000 +0000
@@ -104,7 +104,7 @@
#endif
@@ -38619,7 +39803,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/char/rtc9701_rtc.c 2006-07-12 16:54:23.000000000 +0000
@@ -0,0 +1,888 @@
+/*
+ * linux/drivers/char/rtc9701_rtc.c
@@ -39511,7 +40695,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/char/sh03rtc.c 2006-07-12 16:54:23.000000000 +0000
@@ -0,0 +1,1185 @@
+/*
+ * Real Time Clock interface for Linux
@@ -40700,7 +41884,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/char/sysrq.c 2006-07-12 16:54:23.000000000 +0000
@@ -38,6 +38,18 @@
#include <linux/kexec.h>
@@ -40731,39 +41915,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/char/watchdog/CVS/Entries 2006-07-12 16:54:23.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/char/watchdog/CVS/Repository 2006-07-12 16:54:23.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/char/watchdog/CVS/Root 2006-07-12 16:54:23.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/i2c/CVS/Entries 2006-07-12 16:54:23.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/i2c/CVS/Repository 2006-07-12 16:54:23.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/i2c/CVS/Root 2006-07-12 16:54:23.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/i2c/algos/CVS/Entries 2006-07-12 16:54:23.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/
@@ -40772,17 +41956,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/i2c/algos/CVS/Repository 2006-07-12 16:54:23.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/i2c/algos/CVS/Root 2006-07-12 16:54:23.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/i2c/algos/Kconfig 2006-07-12 16:54:23.000000000 +0000
@@ -53,6 +53,10 @@
tristate "MPC8xx CPM I2C interface"
depends on 8xx && I2C
@@ -40796,7 +41980,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/i2c/algos/Makefile 2006-07-12 16:54:23.000000000 +0000
@@ -6,6 +6,7 @@
obj-$(CONFIG_I2C_ALGOPCF) += i2c-algo-pcf.o
obj-$(CONFIG_I2C_ALGOPCA) += i2c-algo-pca.o
@@ -40807,7 +41991,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/i2c/algos/i2c-algo-voyager.c 2006-07-12 16:54:23.000000000 +0000
@@ -0,0 +1,415 @@
+/* -------------------------------------------------------------------- */
+/* i2c-algo-voyagergx.c: */
@@ -41226,7 +42410,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/i2c/algos/i2c-algo-voyager.h 2006-07-12 16:54:23.000000000 +0000
@@ -0,0 +1,99 @@
+/* ------------------------------------------------------------------------- */
+/* i2c-algo-ite.h i2c driver algorithms for ITE IIC adapters */
@@ -41329,7 +42513,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/i2c/busses/CVS/Entries 2006-07-12 16:54:23.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/
@@ -41337,17 +42521,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/i2c/busses/CVS/Repository 2006-07-12 16:54:23.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/i2c/busses/CVS/Root 2006-07-12 16:54:23.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/i2c/busses/Kconfig 2006-07-12 16:54:23.000000000 +0000
@@ -496,6 +496,16 @@
This driver can also be built as a module. If so, the module
will be called i2c-voodoo3.
@@ -41367,7 +42551,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/i2c/busses/Makefile 2006-07-12 16:54:23.000000000 +0000
@@ -40,6 +40,7 @@
obj-$(CONFIG_I2C_VIA) += i2c-via.o
obj-$(CONFIG_I2C_VIAPRO) += i2c-viapro.o
@@ -41378,7 +42562,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/i2c/busses/i2c-voyager.c 2006-07-12 16:54:23.000000000 +0000
@@ -0,0 +1,216 @@
+/* -------------------------------------------------------------------- */
+/* i2c-voyagergx.c: */
@@ -41598,7 +42782,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/ide/CVS/Entries 2006-07-12 16:54:24.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/
@@ -41608,17 +42792,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/ide/CVS/Repository 2006-07-12 16:54:23.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/ide/CVS/Root 2006-07-12 16:54:23.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/ide/Kconfig 2006-07-12 16:54:24.000000000 +0000
@@ -780,6 +780,9 @@
This option enables the use of the sleep LED as a hard drive
activity LED.
@@ -41631,7 +42815,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/ide/Makefile 2006-07-12 16:54:24.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
@@ -41643,7 +42827,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/ide/ide.c 2006-07-12 16:54:24.000000000 +0000
@@ -1776,6 +1776,7 @@
extern void pnpide_init(void);
@@ -41664,23 +42848,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/ide/legacy/CVS/Entries 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/ide/legacy/CVS/Repository 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/ide/legacy/CVS/Root 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/ide/legacy/ide-cs.c 2006-07-12 16:54:24.000000000 +0000
@@ -73,6 +73,11 @@
#define DEBUG(n, args...)
#endif
@@ -41780,23 +42964,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/ide/pci/CVS/Entries 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/ide/pci/CVS/Repository 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/ide/pci/CVS/Root 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/ide/pci/alim15x3.c 2006-07-12 16:54:24.000000000 +0000
@@ -65,6 +65,16 @@
"PIO mode" };
@@ -41847,23 +43031,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/ide/sh/CVS/Entries 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/ide/sh/CVS/Repository 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/ide/sh/CVS/Root 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/ide/sh/ide-sh.c 2006-07-12 16:54:24.000000000 +0000
@@ -0,0 +1,95 @@
+/*
+ * SuperH default IDE host driver
@@ -41962,23 +43146,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/input/CVS/Entries 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/input/CVS/Repository 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/input/CVS/Root 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/input/keyboard/CVS/Entries 2006-07-12 16:54:24.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//
@@ -41989,17 +43173,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/input/keyboard/CVS/Repository 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/input/keyboard/CVS/Root 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/input/keyboard/Kconfig 2006-07-12 16:54:24.000000000 +0000
@@ -183,4 +183,21 @@
This driver implements support for HIL-keyboards attached
to your machine, so normally you should say Y here.
@@ -42024,7 +43208,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/input/keyboard/Makefile 2006-07-12 16:54:24.000000000 +0000
@@ -11,8 +11,11 @@
obj-$(CONFIG_KEYBOARD_AMIGA) += amikbd.o
obj-$(CONFIG_KEYBOARD_LOCOMO) += locomokbd.o
@@ -42039,7 +43223,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/input/keyboard/hp620_keyb.c 2006-07-12 16:54:24.000000000 +0000
@@ -0,0 +1,169 @@
+/*
+ * drivers/input/keyboard/hp680_keyb.c
@@ -42212,7 +43396,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/input/keyboard/hp680_keyb.c 2006-07-12 16:54:24.000000000 +0000
@@ -0,0 +1,152 @@
+/*
+ * drivers/input/keyboard/hp680_keyb.c
@@ -42368,7 +43552,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/input/keyboard/scan_keyb.c 2006-07-12 16:54:24.000000000 +0000
@@ -0,0 +1,148 @@
+/*
+ * Generic scan keyboard driver
@@ -42520,7 +43704,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/input/keyboard/scan_keyb.h 2006-07-12 16:54:24.000000000 +0000
@@ -0,0 +1,16 @@
+#ifndef __DRIVER_CHAR_SCAN_KEYB_H
+#define __DRIVER_CHAR_SCAN_KEYB_H
@@ -42540,23 +43724,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/input/touchscreen/CVS/Entries 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/input/touchscreen/CVS/Repository 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/input/touchscreen/CVS/Root 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/input/touchscreen/hp680_ts_input.c 2006-07-12 16:54:24.000000000 +0000
@@ -15,7 +15,6 @@
#define HP680_TS_ABS_Y_MIN 80
#define HP680_TS_ABS_Y_MAX 910
@@ -42587,23 +43771,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/mtd/CVS/Entries 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/mtd/CVS/Repository 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/mtd/CVS/Root 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/mtd/maps/CVS/Entries 2006-07-12 16:54:24.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/
@@ -42612,17 +43796,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/mtd/maps/CVS/Repository 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/mtd/maps/CVS/Root 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/mtd/maps/Kconfig 2006-07-12 16:54:24.000000000 +0000
@@ -409,11 +409,37 @@
config MTD_SOLUTIONENGINE
@@ -42664,7 +43848,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/mtd/maps/Makefile 2006-07-12 16:54:24.000000000 +0000
@@ -62,6 +62,7 @@
obj-$(CONFIG_MTD_SBC8240) += sbc8240.o
obj-$(CONFIG_MTD_NOR_TOTO) += omap-toto-flash.o
@@ -42682,7 +43866,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/mtd/maps/microdev-flash.c 2006-07-12 16:54:24.000000000 +0000
@@ -0,0 +1,165 @@
+/*
+ * drivers/mtd/maps/microdev-flash.c
@@ -42851,7 +44035,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/mtd/maps/rts7751r2d-flash.c 2006-07-12 16:54:24.000000000 +0000
@@ -0,0 +1,167 @@
+/* -------------------------------------------------------------------- */
+/* rts7751r2d-flash.c: */
@@ -43022,7 +44206,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/mtd/mtdpart.c 2006-07-12 16:54:24.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);
@@ -43040,7 +44224,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/net/8139too.c 2006-07-12 16:54:24.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 },
@@ -43070,7 +44254,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/net/8390.c 2006-07-12 16:54:24.000000000 +0000
@@ -108,6 +108,13 @@
int ei_debug = 1;
#endif
@@ -43161,7 +44345,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/net/88796l.c 2006-07-12 16:54:24.000000000 +0000
@@ -0,0 +1,95 @@
+#define NE_EEPROM 0x14
+
@@ -43260,7 +44444,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/net/CVS/Entries 2006-07-12 16:54:24.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/
@@ -43271,17 +44455,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/net/CVS/Repository 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/net/CVS/Root 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/net/Kconfig 2006-07-12 16:54:24.000000000 +0000
@@ -1078,7 +1078,7 @@
config NE2000
@@ -43293,7 +44477,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/net/ne.c 2006-07-12 16:54:24.000000000 +0000
@@ -142,6 +142,10 @@
#elif defined(CONFIG_PLAT_OAKS32R) || \
defined(CONFIG_TOSHIBA_RBTX4927) || defined(CONFIG_TOSHIBA_RBTX4938)
@@ -43374,7 +44558,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/net/stnic.c 2006-07-12 16:54:24.000000000 +0000
@@ -20,7 +20,7 @@
#include <asm/system.h>
@@ -43386,7 +44570,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/pcmcia/CVS/Entries 2006-07-12 16:54:24.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/
@@ -43395,17 +44579,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/pcmcia/CVS/Repository 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/pcmcia/CVS/Root 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/pcmcia/Kconfig 2006-07-12 16:54:24.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.
@@ -43439,7 +44623,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/pcmcia/Makefile 2006-07-12 16:54:24.000000000 +0000
@@ -25,8 +25,9 @@
obj-$(CONFIG_I82365) += i82365.o
obj-$(CONFIG_I82092) += i82092.o
@@ -43453,7 +44637,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/pcmcia/hd64461_ss.c 2006-07-12 16:54:24.000000000 +0000
@@ -0,0 +1,679 @@
+/*
+ * drivers/pcmcia/hd64461_ss.c
@@ -44136,7 +45320,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/pcmcia/yenta_socket.c 2006-07-12 16:54:24.000000000 +0000
@@ -49,6 +49,15 @@
#define to_cycles(ns) ((ns)/120)
#define to_ns(cycles) ((cycles)*120)
@@ -44205,9 +45389,526 @@ 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/rtc/CVS/Entries linux-2.6.17/drivers/rtc/CVS/Entries
+--- linux-2.6.17-vanilla/drivers/rtc/CVS/Entries 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.17/drivers/rtc/CVS/Entries 2006-07-12 16:54:25.000000000 +0000
+@@ -0,0 +1,4 @@
++/Kconfig/1.1/Tue Jul 11 07:54:45 2006/-ko/
++/Makefile/1.1/Tue Jul 11 07:54:45 2006/-ko/
++/rtc-sh.c/1.1/Tue Jul 11 07:54:45 2006/-ko/
++D
+diff -ruN linux-2.6.17-vanilla/drivers/rtc/CVS/Repository linux-2.6.17/drivers/rtc/CVS/Repository
+--- linux-2.6.17-vanilla/drivers/rtc/CVS/Repository 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.17/drivers/rtc/CVS/Repository 2006-07-12 16:54:25.000000000 +0000
+@@ -0,0 +1 @@
++linux/drivers/rtc
+diff -ruN linux-2.6.17-vanilla/drivers/rtc/CVS/Root linux-2.6.17/drivers/rtc/CVS/Root
+--- linux-2.6.17-vanilla/drivers/rtc/CVS/Root 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.17/drivers/rtc/CVS/Root 2006-07-12 16:54:25.000000000 +0000
+@@ -0,0 +1 @@
++:pserver:anonymous@linuxsh.cvs.sourceforge.net:/cvsroot/linuxsh
+diff -ruN linux-2.6.17-vanilla/drivers/rtc/Kconfig linux-2.6.17/drivers/rtc/Kconfig
+--- linux-2.6.17-vanilla/drivers/rtc/Kconfig 2006-06-18 01:49:35.000000000 +0000
++++ linux-2.6.17/drivers/rtc/Kconfig 2006-07-12 16:54:25.000000000 +0000
+@@ -147,6 +147,16 @@
+ To compile this driver as a module, choose M here: the
+ module will be called rtc-sa1100.
+
++config RTC_DRV_SH
++ tristate "SuperH On-Chip RTC"
++ depends on RTC_CLASS && SUPERH
++ help
++ Say Y here to enable support for the on-chip RTC found in
++ most SuperH processors.
++
++ To compile this driver as a module, choose M here: the
++ module will be called rtc-sh.
++
+ config RTC_DRV_VR41XX
+ tristate "NEC VR41XX"
+ depends on RTC_CLASS && CPU_VR41XX
+diff -ruN linux-2.6.17-vanilla/drivers/rtc/Makefile linux-2.6.17/drivers/rtc/Makefile
+--- linux-2.6.17-vanilla/drivers/rtc/Makefile 2006-06-18 01:49:35.000000000 +0000
++++ linux-2.6.17/drivers/rtc/Makefile 2006-07-12 16:54:25.000000000 +0000
+@@ -20,3 +20,4 @@
+ obj-$(CONFIG_RTC_DRV_EP93XX) += rtc-ep93xx.o
+ obj-$(CONFIG_RTC_DRV_SA1100) += rtc-sa1100.o
+ obj-$(CONFIG_RTC_DRV_VR41XX) += rtc-vr41xx.o
++obj-$(CONFIG_RTC_DRV_SH) += rtc-sh.o
+diff -ruN linux-2.6.17-vanilla/drivers/rtc/rtc-sh.c linux-2.6.17/drivers/rtc/rtc-sh.c
+--- linux-2.6.17-vanilla/drivers/rtc/rtc-sh.c 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.17/drivers/rtc/rtc-sh.c 2006-07-12 16:54:25.000000000 +0000
+@@ -0,0 +1,467 @@
++/*
++ * SuperH On-Chip RTC Support
++ *
++ * Copyright (C) 2006 Paul Mundt
++ *
++ * Based on the old arch/sh/kernel/cpu/rtc.c by:
++ *
++ * Copyright (C) 2000 Philipp Rumpf <prumpf@tux.org>
++ * Copyright (C) 1999 Tetsuya Okada & Niibe Yutaka
++ *
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License. See the file "COPYING" in the main directory of this archive
++ * for more details.
++ */
++#include <linux/module.h>
++#include <linux/kernel.h>
++#include <linux/bcd.h>
++#include <linux/rtc.h>
++#include <linux/init.h>
++#include <linux/platform_device.h>
++#include <linux/seq_file.h>
++#include <linux/interrupt.h>
++#include <linux/spinlock.h>
++#include <asm/io.h>
++
++#ifdef CONFIG_CPU_SH3
++#define rtc_reg_size sizeof(u16)
++#define RTC_BIT_INVERTED 0 /* No bug on SH7708, SH7709A */
++#elif defined(CONFIG_CPU_SH4)
++#define rtc_reg_size sizeof(u32)
++#define RTC_BIT_INVERTED 0x40 /* bug on SH7750, SH7750S */
++#endif
++
++#define RTC_REG(r) ((r) * rtc_reg_size)
++
++#define R64CNT RTC_REG(0)
++#define RSECCNT RTC_REG(1)
++#define RMINCNT RTC_REG(2)
++#define RHRCNT RTC_REG(3)
++#define RWKCNT RTC_REG(4)
++#define RDAYCNT RTC_REG(5)
++#define RMONCNT RTC_REG(6)
++#define RYRCNT RTC_REG(7)
++#define RSECAR RTC_REG(8)
++#define RMINAR RTC_REG(9)
++#define RHRAR RTC_REG(10)
++#define RWKAR RTC_REG(11)
++#define RDAYAR RTC_REG(12)
++#define RMONAR RTC_REG(13)
++#define RCR1 RTC_REG(14)
++#define RCR2 RTC_REG(15)
++
++/* RCR1 Bits */
++#define RCR1_CF 0x80 /* Carry Flag */
++#define RCR1_CIE 0x10 /* Carry Interrupt Enable */
++#define RCR1_AIE 0x08 /* Alarm Interrupt Enable */
++#define RCR1_AF 0x01 /* Alarm Flag */
++
++/* RCR2 Bits */
++#define RCR2_PEF 0x80 /* PEriodic interrupt Flag */
++#define RCR2_PESMASK 0x70 /* Periodic interrupt Set */
++#define RCR2_RTCEN 0x08 /* ENable RTC */
++#define RCR2_ADJ 0x04 /* ADJustment (30-second) */
++#define RCR2_RESET 0x02 /* Reset bit */
++#define RCR2_START 0x01 /* Start bit */
++
++struct sh_rtc {
++ void __iomem *regbase;
++ unsigned long regsize;
++ struct resource *res;
++ unsigned int alarm_irq, periodic_irq, carry_irq;
++ struct rtc_device *rtc_dev;
++ spinlock_t lock;
++};
++
++static irqreturn_t sh_rtc_interrupt(int irq, void *id, struct pt_regs *regs)
++{
++ struct platform_device *pdev = id;
++ struct sh_rtc *rtc = platform_get_drvdata(pdev);
++ unsigned int tmp, events = 0;
++
++ spin_lock(&rtc->lock);
++
++ tmp = readb(rtc->regbase + RCR1);
++
++ if (tmp & RCR1_AF)
++ events |= RTC_AF | RTC_IRQF;
++
++ tmp &= ~(RCR1_CF | RCR1_AF);
++
++ writeb(tmp, rtc->regbase + RCR1);
++
++ rtc_update_irq(&rtc->rtc_dev->class_dev, 1, events);
++
++ spin_unlock(&rtc->lock);
++
++ return IRQ_HANDLED;
++}
++
++static irqreturn_t sh_rtc_periodic(int irq, void *id, struct pt_regs *regs)
++{
++ struct sh_rtc *rtc = dev_get_drvdata(id);
++
++ spin_lock(&rtc->lock);
++
++ rtc_update_irq(&rtc->rtc_dev->class_dev, 1, RTC_PF | RTC_IRQF);
++
++ spin_unlock(&rtc->lock);
++
++ return IRQ_HANDLED;
++}
++
++static inline void sh_rtc_setpie(struct device *dev, unsigned int enable)
++{
++ struct sh_rtc *rtc = dev_get_drvdata(dev);
++ unsigned int tmp;
++
++ spin_lock_irq(&rtc->lock);
++
++ tmp = readb(rtc->regbase + RCR2);
++
++ if (enable) {
++ tmp &= ~RCR2_PESMASK;
++ tmp |= RCR2_PEF | (2 << 4);
++ } else
++ tmp &= ~(RCR2_PESMASK | RCR2_PEF);
++
++ writeb(tmp, rtc->regbase + RCR2);
++
++ spin_unlock_irq(&rtc->lock);
++}
++
++static inline void sh_rtc_setaie(struct device *dev, unsigned int enable)
++{
++ struct sh_rtc *rtc = dev_get_drvdata(dev);
++ unsigned int tmp;
++
++ spin_lock_irq(&rtc->lock);
++
++ tmp = readb(rtc->regbase + RCR1);
++
++ if (enable)
++ tmp |= RCR1_AIE;
++ else
++ tmp &= ~RCR1_AIE;
++
++ writeb(tmp, rtc->regbase + RCR1);
++
++ spin_unlock_irq(&rtc->lock);
++}
++
++static int sh_rtc_open(struct device *dev)
++{
++ struct sh_rtc *rtc = dev_get_drvdata(dev);
++ unsigned int tmp;
++ int ret;
++
++ tmp = readb(rtc->regbase + RCR1);
++ tmp &= ~RCR1_CF;
++ tmp |= RCR1_CIE;
++ writeb(tmp, rtc->regbase + RCR1);
++
++ ret = request_irq(rtc->periodic_irq, sh_rtc_periodic, SA_INTERRUPT,
++ "sh-rtc period", dev);
++ if (unlikely(ret)) {
++ dev_err(dev, "request period IRQ failed with %d, IRQ %d\n",
++ ret, rtc->periodic_irq);
++ return ret;
++ }
++
++ ret = request_irq(rtc->carry_irq, sh_rtc_interrupt, SA_INTERRUPT,
++ "sh-rtc carry", dev);
++ if (unlikely(ret)) {
++ dev_err(dev, "request carry IRQ failed with %d, IRQ %d\n",
++ ret, rtc->carry_irq);
++ free_irq(rtc->periodic_irq, dev);
++ goto err_bad_carry;
++ }
++
++ ret = request_irq(rtc->alarm_irq, sh_rtc_interrupt, SA_INTERRUPT,
++ "sh-rtc alarm", dev);
++ if (unlikely(ret)) {
++ dev_err(dev, "request alarm IRQ failed with %d, IRQ %d\n",
++ ret, rtc->alarm_irq);
++ goto err_bad_alarm;
++ }
++
++ return 0;
++
++err_bad_alarm:
++ free_irq(rtc->carry_irq, dev);
++err_bad_carry:
++ free_irq(rtc->periodic_irq, dev);
++
++ return ret;
++}
++
++static void sh_rtc_release(struct device *dev)
++{
++ struct sh_rtc *rtc = dev_get_drvdata(dev);
++
++ sh_rtc_setpie(dev, 0);
++
++ free_irq(rtc->periodic_irq, dev);
++ free_irq(rtc->carry_irq, dev);
++ free_irq(rtc->alarm_irq, dev);
++}
++
++static int sh_rtc_proc(struct device *dev, struct seq_file *seq)
++{
++ struct sh_rtc *rtc = dev_get_drvdata(dev);
++ unsigned int tmp;
++
++ tmp = readb(rtc->regbase + RCR1);
++ seq_printf(seq, "alarm_IRQ\t: %s\n",
++ (tmp & RCR1_AIE) ? "yes" : "no");
++ seq_printf(seq, "carry_IRQ\t: %s\n",
++ (tmp & RCR1_CIE) ? "yes" : "no");
++
++ tmp = readb(rtc->regbase + RCR2);
++ seq_printf(seq, "periodic_IRQ\t: %s\n",
++ (tmp & RCR2_PEF) ? "yes" : "no");
++
++ return 0;
++}
++
++static int sh_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg)
++{
++ unsigned int ret = -ENOIOCTLCMD;
++
++ switch (cmd) {
++ case RTC_PIE_OFF:
++ case RTC_PIE_ON:
++ sh_rtc_setpie(dev, cmd == RTC_PIE_ON);
++ ret = 0;
++ break;
++ case RTC_AIE_OFF:
++ case RTC_AIE_ON:
++ sh_rtc_setaie(dev, cmd == RTC_AIE_ON);
++ ret = 0;
++ break;
++ }
++
++ return ret;
++}
++
++static int sh_rtc_read_time(struct device *dev, struct rtc_time *tm)
++{
++ struct platform_device *pdev = to_platform_device(dev);
++ struct sh_rtc *rtc = platform_get_drvdata(pdev);
++ unsigned int sec128, sec2, yr, yr100, cf_bit;
++
++ do {
++ unsigned int tmp;
++
++ spin_lock_irq(&rtc->lock);
++
++ tmp = readb(rtc->regbase + RCR1);
++ tmp &= ~RCR1_CF; /* Clear CF-bit */
++ tmp |= RCR1_CIE;
++ writeb(tmp, rtc->regbase + RCR1);
++
++ sec128 = readb(rtc->regbase + R64CNT);
++
++ tm->tm_sec = BCD2BIN(readb(rtc->regbase + RSECCNT));
++ tm->tm_min = BCD2BIN(readb(rtc->regbase + RMINCNT));
++ tm->tm_hour = BCD2BIN(readb(rtc->regbase + RHRCNT));
++ tm->tm_wday = BCD2BIN(readb(rtc->regbase + RWKCNT));
++ tm->tm_mday = BCD2BIN(readb(rtc->regbase + RDAYCNT));
++ tm->tm_mon = BCD2BIN(readb(rtc->regbase + RMONCNT));
++
++#if defined(CONFIG_CPU_SH4)
++ yr = readw(rtc->regbase + RYRCNT);
++ yr100 = BCD2BIN(yr >> 8);
++ yr &= 0xff;
++#else
++ yr = readb(rtc->regbase + RYRCNT);
++ yr100 = BCD2BIN((yr == 0x99) ? 0x19 : 0x20);
++#endif
++
++ tm->tm_year = (yr100 * 100 + BCD2BIN(yr)) - 1900;
++
++ sec2 = readb(rtc->regbase + R64CNT);
++ cf_bit = readb(rtc->regbase + RCR1) & RCR1_CF;
++
++ spin_unlock_irq(&rtc->lock);
++ } while (cf_bit != 0 || ((sec128 ^ sec2) & RTC_BIT_INVERTED) != 0);
++
++#if RTC_BIT_INVERTED != 0
++ if ((sec128 & RTC_BIT_INVERTED))
++ tm->tm_sec--;
++#endif
++
++ dev_dbg(&dev, "%s: tm is secs=%d, mins=%d, hours=%d, "
++ "mday=%d, mon=%d, year=%d, wday=%d\n",
++ __FUNCTION__,
++ tm->tm_sec, tm->tm_min, tm->tm_hour,
++ tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday);
++
++ if (rtc_valid_tm(tm) < 0)
++ dev_err(dev, "invalid date\n");
++
++ return 0;
++}
++
++static int sh_rtc_set_time(struct device *dev, struct rtc_time *tm)
++{
++ struct platform_device *pdev = to_platform_device(dev);
++ struct sh_rtc *rtc = platform_get_drvdata(pdev);
++ unsigned int tmp;
++ int year;
++
++ spin_lock_irq(&rtc->lock);
++
++ /* Reset pre-scaler & stop RTC */
++ tmp = readb(rtc->regbase + RCR2);
++ tmp |= RCR2_RESET;
++ writeb(tmp, rtc->regbase + RCR2);
++
++ writeb(BIN2BCD(tm->tm_sec), rtc->regbase + RSECCNT);
++ writeb(BIN2BCD(tm->tm_min), rtc->regbase + RMINCNT);
++ writeb(BIN2BCD(tm->tm_hour), rtc->regbase + RHRCNT);
++ writeb(BIN2BCD(tm->tm_wday), rtc->regbase + RWKCNT);
++ writeb(BIN2BCD(tm->tm_mday), rtc->regbase + RDAYCNT);
++ writeb(BIN2BCD(tm->tm_mon), rtc->regbase + RMONCNT);
++
++#ifdef CONFIG_CPU_SH3
++ year = tm->tm_year % 100;
++ writeb(BIN2BCD(year), rtc->regbase + RYRCNT);
++#else
++ year = (BIN2BCD((tm->tm_year + 1900) / 100) << 8) |
++ BIN2BCD(tm->tm_year % 100);
++ writew(year, rtc->regbase + RYRCNT);
++#endif
++
++ /* Start RTC */
++ tmp = readb(rtc->regbase + RCR2);
++ tmp &= ~RCR2_RESET;
++ tmp |= RCR2_RTCEN | RCR2_START;
++ writeb(tmp, rtc->regbase + RCR2);
++
++ spin_unlock_irq(&rtc->lock);
++
++ return 0;
++}
++
++static struct rtc_class_ops sh_rtc_ops = {
++ .open = sh_rtc_open,
++ .release = sh_rtc_release,
++ .ioctl = sh_rtc_ioctl,
++ .read_time = sh_rtc_read_time,
++ .set_time = sh_rtc_set_time,
++ .proc = sh_rtc_proc,
++};
++
++static int __devinit sh_rtc_probe(struct platform_device *pdev)
++{
++ struct sh_rtc *rtc;
++ struct resource *res;
++ int ret = -ENOENT;
++
++ rtc = kzalloc(sizeof(struct sh_rtc), GFP_KERNEL);
++ if (unlikely(!rtc))
++ return -ENOMEM;
++
++ spin_lock_init(&rtc->lock);
++
++ rtc->periodic_irq = platform_get_irq(pdev, 0);
++ if (unlikely(rtc->periodic_irq < 0)) {
++ dev_err(&pdev->dev, "No IRQ for period\n");
++ goto err_badres;
++ }
++
++ rtc->carry_irq = platform_get_irq(pdev, 1);
++ if (unlikely(rtc->carry_irq < 0)) {
++ dev_err(&pdev->dev, "No IRQ for carry\n");
++ goto err_badres;
++ }
++
++ rtc->alarm_irq = platform_get_irq(pdev, 2);
++ if (unlikely(rtc->alarm_irq < 0)) {
++ dev_err(&pdev->dev, "No IRQ for alarm\n");
++ goto err_badres;
++ }
++
++ res = platform_get_resource(pdev, IORESOURCE_IO, 0);
++ if (unlikely(res == NULL)) {
++ dev_err(&pdev->dev, "No IO resource\n");
++ goto err_badres;
++ }
++
++ rtc->regsize = res->end - res->start + 1;
++
++ rtc->res = request_mem_region(res->start, rtc->regsize, pdev->name);
++ if (unlikely(!rtc->res)) {
++ ret = -EBUSY;
++ goto err_badres;
++ }
++
++ rtc->regbase = (void __iomem *)rtc->res->start;
++ if (unlikely(!rtc->regbase)) {
++ ret = -EINVAL;
++ goto err_badmap;
++ }
++
++ rtc->rtc_dev = rtc_device_register("sh", &pdev->dev,
++ &sh_rtc_ops, THIS_MODULE);
++ if (IS_ERR(rtc)) {
++ ret = PTR_ERR(rtc->rtc_dev);
++ goto err_badmap;
++ }
++
++ platform_set_drvdata(pdev, rtc);
++
++ return 0;
++
++err_badmap:
++ release_resource(rtc->res);
++err_badres:
++ kfree(rtc);
++
++ return ret;
++}
++
++static int __devexit sh_rtc_remove(struct platform_device *pdev)
++{
++ struct sh_rtc *rtc = platform_get_drvdata(pdev);
++
++ if (likely(rtc->rtc_dev))
++ rtc_device_unregister(rtc->rtc_dev);
++
++ sh_rtc_setpie(&pdev->dev, 0);
++ sh_rtc_setaie(&pdev->dev, 0);
++
++ release_resource(rtc->res);
++
++ platform_set_drvdata(pdev, NULL);
++
++ kfree(rtc);
++
++ return 0;
++}
++static struct platform_driver sh_rtc_platform_driver = {
++ .driver = {
++ .name = "sh-rtc",
++ .owner = THIS_MODULE,
++ },
++ .probe = sh_rtc_probe,
++ .remove = __devexit_p(sh_rtc_remove),
++};
++
++static int __init sh_rtc_init(void)
++{
++ return platform_driver_register(&sh_rtc_platform_driver);
++}
++
++static void __exit sh_rtc_exit(void)
++{
++ platform_driver_unregister(&sh_rtc_platform_driver);
++}
++
++module_init(sh_rtc_init);
++module_exit(sh_rtc_exit);
++
++MODULE_DESCRIPTION("SuperH on-chip RTC driver");
++MODULE_AUTHOR("Paul Mundt <lethal@linux-sh.org>");
++MODULE_LICENSE("GPL");
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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/serial/8250.c 2006-07-12 16:54:24.000000000 +0000
@@ -193,6 +193,9 @@
.fifo_size = 32,
.tx_loadsz = 16,
@@ -44252,7 +45953,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/serial/CVS/Entries 2006-07-12 16:54:24.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/
@@ -44260,17 +45961,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/serial/CVS/Repository 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/serial/CVS/Root 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/serial/sh-sci.c 2006-07-12 16:54:24.000000000 +0000
@@ -3,7 +3,7 @@
*
* SuperH on-chip serial module support. (SCI with no FIFO / with FIFO)
@@ -44848,7 +46549,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/serial/sh-sci.h 2006-07-12 16:54:24.000000000 +0000
@@ -279,6 +279,8 @@
int type;
unsigned char irqs[4]; /* ERI, RXI, TXI, BRI */
@@ -44860,23 +46561,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/sh/CVS/Entries 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/sh/CVS/Repository 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/sh/CVS/Root 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/sh/Makefile 2006-07-12 16:54:24.000000000 +0000
@@ -2,5 +2,5 @@
# Makefile for the SuperH specific drivers.
#
@@ -44886,7 +46587,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/sh/superhyway/CVS/Entries 2006-07-12 16:54:24.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/
@@ -44894,33 +46595,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/sh/superhyway/CVS/Repository 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/sh/superhyway/CVS/Root 2006-07-12 16:54:24.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/usb/CVS/Entries 2006-07-12 16:54:25.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/usb/CVS/Repository 2006-07-12 16:54:25.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/usb/CVS/Root 2006-07-12 16:54:25.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/usb/Kconfig 2006-07-12 16:54:25.000000000 +0000
@@ -29,6 +29,8 @@
default y if PPC_MPC52xx
# MIPS:
@@ -44932,7 +46633,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/usb/host/CVS/Entries 2006-07-12 16:54:25.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/
@@ -44940,17 +46641,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/usb/host/CVS/Repository 2006-07-12 16:54:25.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/usb/host/CVS/Root 2006-07-12 16:54:25.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/usb/host/Kconfig 2006-07-12 16:54:25.000000000 +0000
@@ -148,3 +148,13 @@
To compile this driver as a module, choose M here: the
module will be called "sl811_cs".
@@ -44967,7 +46668,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/usb/host/ohci-hcd.c 2006-07-12 16:54:25.000000000 +0000
@@ -878,7 +878,9 @@
MODULE_DESCRIPTION (DRIVER_INFO);
MODULE_LICENSE ("GPL");
@@ -44989,7 +46690,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/usb/host/ohci-voyagergx.c 2006-07-12 16:54:25.000000000 +0000
@@ -0,0 +1,259 @@
+/*
+ * SM501 USB HCD for Linux Version.
@@ -45252,7 +46953,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/video/CVS/Entries 2006-07-12 16:54:25.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//
@@ -45263,17 +46964,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/video/CVS/Repository 2006-07-12 16:54:25.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/video/CVS/Root 2006-07-12 16:54:25.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/video/Kconfig 2006-07-12 16:54:25.000000000 +0000
@@ -151,6 +151,21 @@
help
Support the Permedia2 FIFO disconnect feature (see CONFIG_FB_PM2).
@@ -45298,7 +46999,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/video/Makefile 2006-07-12 16:54:25.000000000 +0000
@@ -38,6 +38,8 @@
obj-$(CONFIG_FB_KYRO) += kyro/
obj-$(CONFIG_FB_SAVAGE) += savage/
@@ -45310,24 +47011,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/video/backlight/CVS/Entries 2006-07-12 16:54:25.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//
++/hp680_bl.c/1.6/Wed Jul 12 16:51:58 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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/video/backlight/CVS/Repository 2006-07-12 16:54:25.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/video/backlight/CVS/Root 2006-07-12 16:54:25.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/video/backlight/Kconfig 2006-07-12 16:54:25.000000000 +0000
@@ -51,7 +51,7 @@
backlight driver.
@@ -45339,7 +47040,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/video/backlight/hp680_bl.c 2006-07-12 16:54:25.000000000 +0000
@@ -1,7 +1,7 @@
/*
* Backlight Driver for HP Jornada 680
@@ -45358,45 +47059,15 @@ diff -ruN linux-2.6.17-vanilla/drivers/video/backlight/hp680_bl.c linux-2.6.17/d
#define HP680_MAX_INTENSITY 255
#define HP680_DEFAULT_INTENSITY 10
-@@ -64,6 +64,37 @@
+@@ -64,7 +64,6 @@
current_intensity = intensity;
}
-+static void hp680bl_blank(int blank)
-+{
-+ u16 v;
-+
-+ switch(blank) {
-+
-+ case FB_BLANK_NORMAL:
-+ case FB_BLANK_VSYNC_SUSPEND:
-+ case FB_BLANK_HSYNC_SUSPEND:
-+ case FB_BLANK_POWERDOWN:
-+ if (hp680bl_powermode == FB_BLANK_UNBLANK) {
-+ hp680bl_send_intensity(0);
-+ hp680bl_powermode = blank;
-+ sh_dac_disable(DAC_LCD_BRIGHTNESS);
-+ v = inw(HD64461_GPBDR);
-+ v |= HD64461_GPBDR_LCDOFF;
-+ outw(v, HD64461_GPBDR);
-+ }
-+ break;
-+ case FB_BLANK_UNBLANK:
-+ if (hp680bl_powermode != FB_BLANK_UNBLANK) {
-+ sh_dac_enable(DAC_LCD_BRIGHTNESS);
-+ v = inw(HD64461_GPBDR);
-+ v &= ~HD64461_GPBDR_LCDOFF;
-+ outw(v, HD64461_GPBDR);
-+ hp680bl_powermode = blank;
-+ hp680bl_send_intensity(current_intensity);
-+ }
-+ break;
-+ }
-+}
-
+-
#ifdef CONFIG_PM
static int hp680bl_suspend(struct platform_device *dev, pm_message_t state)
-@@ -102,6 +133,8 @@
+ {
+@@ -102,6 +101,8 @@
.update_status = hp680bl_set_intensity,
};
@@ -45405,15 +47076,7 @@ diff -ruN linux-2.6.17-vanilla/drivers/video/backlight/hp680_bl.c linux-2.6.17/d
static int __init hp680bl_probe(struct platform_device *dev)
{
hp680_backlight_device = backlight_device_register ("hp680-bl",
-@@ -156,13 +189,13 @@
-
- static void __exit hp680bl_exit(void)
- {
-- platform_device_unregister(hp680bl_device);
-+ platform_device_unregister(&hp680bl_device);
- platform_driver_unregister(&hp680bl_driver);
- }
-
+@@ -163,6 +164,6 @@
module_init(hp680bl_init);
module_exit(hp680bl_exit);
@@ -45423,23 +47086,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/video/console/CVS/Entries 2006-07-12 16:54:25.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/video/console/CVS/Repository 2006-07-12 16:54:25.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/video/console/CVS/Root 2006-07-12 16:54:25.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/video/console/Kconfig 2006-07-12 16:54:25.000000000 +0000
@@ -6,7 +6,7 @@
config VGA_CONSOLE
@@ -45451,7 +47114,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/video/hitfb.c 2006-07-12 16:54:25.000000000 +0000
@@ -4,7 +4,7 @@
* (C) 1999 Mihai Spatar
* (C) 2000 YAEGASHI Takeshi
@@ -45835,7 +47498,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/video/pvr2fb.c 2006-07-12 16:54:25.000000000 +0000
@@ -189,7 +189,7 @@
static unsigned int is_blanked = 0; /* Is the screen blanked? */
@@ -45901,7 +47564,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/video/voyager/CVS/Entries 2006-07-12 16:54:25.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/
@@ -45914,17 +47577,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/video/voyager/CVS/Repository 2006-07-12 16:54:25.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/video/voyager/CVS/Root 2006-07-12 16:54:25.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/video/voyager/Makefile 2006-07-12 16:54:25.000000000 +0000
@@ -0,0 +1,13 @@
+#
+# Makefile for the VoyagerGX framebuffer driver
@@ -45941,7 +47604,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/video/voyager/voyager_alphafb.c 2006-07-12 16:54:25.000000000 +0000
@@ -0,0 +1,282 @@
+/*
+ * linux/drivers/video/voyager_alphafb.c -- voyager alpha frame buffer driver
@@ -46227,7 +47890,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/video/voyager/voyager_crtcsrfb.c 2006-07-12 16:54:25.000000000 +0000
@@ -0,0 +1,240 @@
+/*
+ * linux/drivers/video/voyager_crtcsrfb.c -- voyager crt HWC frame buffer driver
@@ -46471,7 +48134,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/video/voyager/voyager_crtfb.c 2006-07-12 16:54:25.000000000 +0000
@@ -0,0 +1,240 @@
+/*
+ * linux/drivers/video/voyager_crtfb.c -- voyager crt frame buffer driver
@@ -46715,7 +48378,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/video/voyager/voyager_gxfb.c 2006-07-12 16:54:25.000000000 +0000
@@ -0,0 +1,441 @@
+/*
+ * linux/drivers/video/voyager_gxfb.c -- voyager panel frame buffer driver
@@ -47160,7 +48823,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/video/voyager/voyager_panelcsrfb.c 2006-07-12 16:54:25.000000000 +0000
@@ -0,0 +1,240 @@
+/*
+ * linux/drivers/video/voyager_panelcsrfb.c -- voyager panel HWC frame buffer driver
@@ -47404,7 +49067,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/video/voyager/voyager_valphafb.c 2006-07-12 16:54:25.000000000 +0000
@@ -0,0 +1,286 @@
+/*
+ * linux/drivers/video/voyager_valphafb.c -- voyager video alpha frame buffer driver
@@ -47694,7 +49357,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/drivers/video/voyager/voyager_videofb.c 2006-07-12 16:54:25.000000000 +0000
@@ -0,0 +1,273 @@
+/*
+ * linux/drivers/video/voyager_videofb.c -- voyager video frame buffer driver
@@ -47971,25 +49634,25 @@ 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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/CVS/Entries 2006-07-12 16:54:25.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/CVS/Repository 2006-07-12 16:54:25.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/CVS/Root 2006-07-12 16:54:25.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-07 10:17:07.000000000 +0000
-@@ -0,0 +1,113 @@
++++ linux-2.6.17/include/asm-sh/CVS/Entries 2006-07-12 16:54:25.000000000 +0000
+@@ -0,0 +1,114 @@
+/adc.h/1.2/Fri Sep 24 14:58:00 2004/-ko/
+/apm.h/1.1/Sun Jan 29 17:46:24 2006//
+/atomic.h/1.6/Mon Mar 27 21:06:15 2006/-ko/
@@ -48019,8 +49682,6 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/CVS/Entries linux-2.6.17/include/a
+/ioctls.h/1.5/Sun Jan 22 17:35:31 2006/-ko/
+/ipc.h/1.5/Tue Jun 21 04:15:52 2005/-ko/
+/irq-sh73180.h/1.2/Sun Jan 8 12:22:58 2006//
-+/irq-sh7780.h/1.2/Wed Jan 18 01:27:08 2006/-ko/
-+/irq.h/1.30/Mon Jan 30 16:12:21 2006/-ko/
+/keyboard.h/1.3/Fri May 16 17:19:08 2003/-ko/
+/kgdb.h/1.6/Sun Feb 5 12:27:59 2006//
+/kmap_types.h/1.3/Thu Mar 11 18:08:05 2004//
@@ -48041,7 +49702,6 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/CVS/Entries linux-2.6.17/include/a
+/pm.h/1.1/Sun Jan 29 17:46:24 2006//
+/posix_types.h/1.3/Thu Oct 9 14:59:21 2003//
+/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/
+/scatterlist.h/1.6/Sat Sep 3 20:05:39 2005/-ko/
+/se.h/1.1/Wed Jan 4 17:53:54 2006/-ko/
@@ -48103,19 +49763,23 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/CVS/Entries linux-2.6.17/include/a
+/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/
++/rtc.h/1.6/Sat Jul 8 20:16:14 2006/-ko/
++/irq-sh7780.h/1.3/Wed Jul 12 16:51:59 2006/-ko/
++/irq.h/1.31/Wed Jul 12 16:51:59 2006/-ko/
++/sfp-machine.h/1.1/Wed Jul 12 10:35:55 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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/CVS/Repository 2006-07-12 16:54:25.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/CVS/Root 2006-07-12 16:54:25.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/apm.h 2006-07-12 16:54:25.000000000 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2006 (c) Andriy Skulysh <askulysh@gmail.com>
@@ -48165,7 +49829,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/atomic.h 2006-07-12 16:54:25.000000000 +0000
@@ -14,6 +14,7 @@
#define atomic_read(v) ((v)->counter)
#define atomic_set(v,i) ((v)->counter = (i))
@@ -48176,7 +49840,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/bigsur/CVS/Entries 2006-07-12 16:54:26.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//
@@ -48184,17 +49848,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/bigsur/CVS/Repository 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/bigsur/CVS/Root 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/bitops.h 2006-07-12 16:54:25.000000000 +0000
@@ -6,7 +6,7 @@
/* For __swab32 */
#include <asm/byteorder.h>
@@ -48269,7 +49933,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/bugs.h 2006-07-12 16:54:25.000000000 +0000
@@ -32,6 +32,10 @@
case CPU_SH7750 ... CPU_SH4_501:
*p++ = '4';
@@ -48283,7 +49947,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/cache.h 2006-07-12 16:54:25.000000000 +0000
@@ -10,7 +10,6 @@
#ifdef __KERNEL__
@@ -48338,7 +50002,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/cacheflush.h 2006-07-12 16:54:25.000000000 +0000
@@ -2,6 +2,7 @@
#define __ASM_SH_CACHEFLUSH_H
#ifdef __KERNEL__
@@ -48349,23 +50013,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/cat68701/CVS/Entries 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/cat68701/CVS/Repository 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/cat68701/CVS/Root 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/checksum.h 2006-07-12 16:54:25.000000000 +0000
@@ -160,6 +160,7 @@
}
@@ -48384,7 +50048,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/cpu-sh2/CVS/Entries 2006-07-12 16:54:26.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/
@@ -48396,17 +50060,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/cpu-sh2/CVS/Repository 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/cpu-sh2/CVS/Root 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/cpu-sh3/CVS/Entries 2006-07-12 16:54:26.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/
@@ -48424,17 +50088,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/cpu-sh3/CVS/Repository 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/cpu-sh3/CVS/Root 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/cpu-sh3/cache.h 2006-07-12 16:54:26.000000000 +0000
@@ -26,7 +26,7 @@
#define CCR_CACHE_ENABLE CCR_CACHE_CE
#define CCR_CACHE_INVALIDATE CCR_CACHE_CF
@@ -48446,7 +50110,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/cpu-sh3/cacheflush.h 2006-07-12 16:54:26.000000000 +0000
@@ -10,7 +10,7 @@
#ifndef __ASM_CPU_SH3_CACHEFLUSH_H
#define __ASM_CPU_SH3_CACHEFLUSH_H
@@ -48532,7 +50196,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/cpu-sh3/freq.h 2006-07-12 16:54:26.000000000 +0000
@@ -18,5 +18,9 @@
#define MIN_DIVISOR_NR 0
#define MAX_DIVISOR_NR 4
@@ -48545,7 +50209,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/cpu-sh3/timer.h 2006-07-12 16:54:26.000000000 +0000
@@ -23,6 +23,10 @@
* ---------------------------------------------------------------------------
*/
@@ -48569,7 +50233,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/cpu-sh4/CVS/Entries 2006-07-12 16:54:26.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/
@@ -48587,17 +50251,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/cpu-sh4/CVS/Repository 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/cpu-sh4/CVS/Root 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/cpu-sh4/addrspace.h 2006-07-12 16:54:26.000000000 +0000
@@ -22,5 +22,8 @@
#define P4SEG_TLB_DATA 0xf7000000
#define P4SEG_REG_BASE 0xff000000
@@ -48609,7 +50273,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/cpu-sh4/cache.h 2006-07-12 16:54:26.000000000 +0000
@@ -22,7 +22,9 @@
#define CCR_CACHE_ICE 0x0100 /* Instruction Cache Enable */
#define CCR_CACHE_ICI 0x0800 /* IC Invalidate */
@@ -48622,7 +50286,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/cpu-sh4/cacheflush.h 2006-07-12 16:54:26.000000000 +0000
@@ -16,34 +16,26 @@
* caching; in which case they're only semi-broken),
* so we need them.
@@ -48677,7 +50341,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/cpu-sh4/dma-sh7780.h 2006-07-12 16:54:26.000000000 +0000
@@ -0,0 +1,39 @@
+#ifndef __ASM_SH_CPU_SH4_DMA_SH7780_H
+#define __ASM_SH_CPU_SH4_DMA_SH7780_H
@@ -48720,7 +50384,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/cpu-sh4/dma.h 2006-07-12 16:54:26.000000000 +0000
@@ -1,11 +1,17 @@
#ifndef __ASM_CPU_SH4_DMA_H
#define __ASM_CPU_SH4_DMA_H
@@ -48758,7 +50422,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/cpu-sh4/sq.h 2006-07-12 16:54:26.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)
@@ -48798,39 +50462,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/cqreek/CVS/Entries 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/cqreek/CVS/Repository 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/cqreek/CVS/Root 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/dmida/CVS/Entries 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/dmida/CVS/Repository 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/dmida/CVS/Root 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/dreamcast/CVS/Entries 2006-07-12 16:54:26.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//
@@ -48838,17 +50502,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/dreamcast/CVS/Repository 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/dreamcast/CVS/Root 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/ec3104/CVS/Entries 2006-07-12 16:54:26.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//
@@ -48857,50 +50521,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/ec3104/CVS/Repository 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/ec3104/CVS/Root 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/edosk7705/CVS/Entries 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/edosk7705/CVS/Repository 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/edosk7705/CVS/Root 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/harp/CVS/Entries 2006-07-12 16:54:25.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/harp/CVS/Repository 2006-07-12 16:54:25.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/harp/CVS/Root 2006-07-12 16:54:25.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/hd64461.h 2006-07-12 16:54:25.000000000 +0000
@@ -0,0 +1,208 @@
+#ifndef __ASM_SH_HD64461
+#define __ASM_SH_HD64461
@@ -49112,7 +50776,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/hd64465/CVS/Entries 2006-07-12 16:54:26.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//
@@ -49120,17 +50784,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/hd64465/CVS/Repository 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/hd64465/CVS/Root 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/hp6xx/CVS/Entries 2006-07-12 16:54:26.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/
@@ -49138,17 +50802,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/hp6xx/CVS/Repository 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/hp6xx/CVS/Root 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/hp6xx/hp6xx.h 2006-07-12 16:54:26.000000000 +0000
@@ -2,16 +2,33 @@
#define __ASM_SH_HP6XX_H
@@ -49231,7 +50895,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/hp6xx/io.h 2006-07-12 16:54:26.000000000 +0000
@@ -4,7 +4,7 @@
/*
* Nothing special here.. just use the generic cchip io routines.
@@ -49243,24 +50907,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/hs7751rvoip/CVS/Entries 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/hs7751rvoip/CVS/Repository 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/hs7751rvoip/CVS/Root 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/hs7751rvoip/hs7751rvoip.h 2006-07-12 16:54:26.000000000 +0000
@@ -19,8 +19,6 @@
#define PA_OUTPORTR 0xa400000e /* Output Port Reguster */
#define PA_VERREG 0xa4000014 /* FPGA Version Register */
@@ -49286,7 +50950,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/io.h 2006-07-12 16:54:25.000000000 +0000
@@ -210,6 +210,11 @@
*(volatile unsigned long*)addr = b;
}
@@ -49301,7 +50965,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/irq-sh73180.h 2006-07-12 16:54:25.000000000 +0000
@@ -12,14 +12,14 @@
#undef INTC_IPRC
#undef INTC_IPRD
@@ -49334,9 +50998,24 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/irq-sh73180.h linux-2.6.17/include
#define FLCTL_IPR_ADDR INTC_IPRH
#define FLCTL_IPR_POS 1
#define FLCTL_PRIORITY 3
+diff -ruN linux-2.6.17-vanilla/include/asm-sh/irq-sh7780.h linux-2.6.17/include/asm-sh/irq-sh7780.h
+--- linux-2.6.17-vanilla/include/asm-sh/irq-sh7780.h 2006-06-18 01:49:35.000000000 +0000
++++ linux-2.6.17/include/asm-sh/irq-sh7780.h 2006-07-12 16:54:25.000000000 +0000
+@@ -145,11 +145,6 @@
+ #define TMU_CH5_IPR_POS 1
+ #define TMU_CH5_PRIORITY 2
+
+-#define RTC_IRQ 22
+-#define RTC_IPR_ADDR INTC_INT2PRI1
+-#define RTC_IPR_POS 0
+-#define RTC_PRIORITY TIMER_PRIORITY
+-
+ /* SCIF0 */
+ #define SCIF0_ERI_IRQ 40
+ #define SCIF0_RXI_IRQ 41
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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/irq.h 2006-07-12 16:54:25.000000000 +0000
@@ -336,6 +336,11 @@
extern unsigned short *irq_mask_register;
@@ -49349,9 +51028,18 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/irq.h linux-2.6.17/include/asm-sh/
* Function for "on chip support modules".
*/
extern void make_ipr_irq(unsigned int irq, unsigned int addr,
+@@ -578,7 +583,7 @@
+ #define NR_INTC2_IRQS 64
+ #elif defined(CONFIG_CPU_SUBTYPE_SH7780)
+ #define INTC2_BASE 0xffd40000
+-#define INTC2_FIRST_IRQ 22
++#define INTC2_FIRST_IRQ 21
+ #define INTC2_INTMSK_OFFSET (0x38)
+ #define INTC2_INTMSKCLR_OFFSET (0x3c)
+ #define NR_INTC2_IRQS 60
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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/kexec.h 2006-07-12 16:54:25.000000000 +0000
@@ -23,6 +23,8 @@
/* The native architecture */
#define KEXEC_ARCH KEXEC_ARCH_SH
@@ -49363,7 +51051,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/kgdb.h 2006-07-12 16:54:25.000000000 +0000
@@ -128,4 +128,19 @@
#define KGDB_ASSERT(condition, message)
#endif
@@ -49386,7 +51074,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/landisk/CVS/Entries 2006-07-12 16:54:26.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/
@@ -49394,17 +51082,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/landisk/CVS/Repository 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/landisk/CVS/Root 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/landisk/gio.h 2006-07-12 16:54:26.000000000 +0000
@@ -0,0 +1,45 @@
+#ifndef __ASM_SH_LANDISK_GIO_H
+#define __ASM_SH_LANDISK_GIO_H
@@ -49453,7 +51141,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/landisk/ide.h 2006-07-12 16:54:26.000000000 +0000
@@ -0,0 +1,14 @@
+/*
+ * modifed by kogiidena
@@ -49471,7 +51159,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/landisk/iodata_landisk.h 2006-07-12 16:54:26.000000000 +0000
@@ -0,0 +1,79 @@
+#ifndef __ASM_SH_IODATA_LANDISK_H
+#define __ASM_SH_IODATA_LANDISK_H
@@ -49554,7 +51242,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/mc146818rtc.h 2006-07-12 16:54:25.000000000 +0000
@@ -24,7 +24,7 @@
#define CMOS_WRITE(val,addr) __CMOS_WRITE(val,addr,b)
@@ -49566,7 +51254,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/mmu.h 2006-07-12 16:54:25.000000000 +0000
@@ -25,5 +25,60 @@
typedef unsigned long mm_context_t;
@@ -49631,7 +51319,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/mmu_context.h 2006-07-12 16:54:25.000000000 +0000
@@ -174,9 +174,7 @@
{
/* Enable MMU */
@@ -49655,7 +51343,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/mpc1211/CVS/Entries 2006-07-12 16:54:26.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/
@@ -49667,17 +51355,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/mpc1211/CVS/Repository 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/mpc1211/CVS/Root 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/namei.h 2006-07-12 16:54:25.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 $
@@ -49686,7 +51374,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/overdrive/CVS/Entries 2006-07-12 16:54:26.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//
@@ -49695,17 +51383,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/overdrive/CVS/Repository 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/overdrive/CVS/Root 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/page.h 2006-07-12 16:54:25.000000000 +0000
@@ -31,7 +31,6 @@
#define HPAGE_SIZE (1UL << HPAGE_SHIFT)
#define HPAGE_MASK (~(HPAGE_SIZE-1))
@@ -49767,7 +51455,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/pci.h 2006-07-12 16:54:25.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
@@ -49837,7 +51525,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/pgalloc.h 2006-07-12 16:54:25.000000000 +0000
@@ -1,15 +1,6 @@
#ifndef __ASM_SH_PGALLOC_H
#define __ASM_SH_PGALLOC_H
@@ -49914,7 +51602,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/pgtable.h 2006-07-12 16:54:25.000000000 +0000
@@ -1,43 +1,43 @@
-#ifndef __ASM_SH_PGTABLE_H
-#define __ASM_SH_PGTABLE_H
@@ -50177,7 +51865,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/pm.h 2006-07-12 16:54:25.000000000 +0000
@@ -0,0 +1,17 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
@@ -50198,7 +51886,7 @@ 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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/processor.h 2006-07-12 16:54:26.000000000 +0000
@@ -148,6 +148,10 @@
union sh_fpu_union fpu;
};
@@ -50231,24 +51919,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/r7780rp/CVS/Entries 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/r7780rp/CVS/Repository 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/r7780rp/CVS/Root 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/r7780rp/ide.h 2006-07-12 16:54:26.000000000 +0000
@@ -0,0 +1,8 @@
+#ifndef __ASM_SH_R7780RP_IDE_H
+#define __ASM_SH_R7780RP_IDE_H
@@ -50260,7 +51948,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/r7780rp/r7780rp.h 2006-07-12 16:54:26.000000000 +0000
@@ -0,0 +1,177 @@
+#ifndef __ASM_SH_RENESAS_R7780RP_H
+#define __ASM_SH_RENESAS_R7780RP_H
@@ -50439,9 +52127,23 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/r7780rp/r7780rp.h linux-2.6.17/inc
+#include <asm/io_generic.h>
+
+#endif /* __ASM_SH_RENESAS_R7780RP */
+diff -ruN linux-2.6.17-vanilla/include/asm-sh/rtc.h linux-2.6.17/include/asm-sh/rtc.h
+--- linux-2.6.17-vanilla/include/asm-sh/rtc.h 2006-06-18 01:49:35.000000000 +0000
++++ linux-2.6.17/include/asm-sh/rtc.h 2006-07-12 16:54:26.000000000 +0000
+@@ -8,8 +8,8 @@
+ extern void sh_rtc_gettimeofday(struct timespec *ts);
+ extern int sh_rtc_settimeofday(const time_t secs);
+ extern void (*board_time_init)(void);
+-extern void (*rtc_get_time)(struct timespec *);
+-extern int (*rtc_set_time)(const time_t);
++extern void (*rtc_sh_get_time)(struct timespec *);
++extern int (*rtc_sh_set_time)(const time_t);
+
+ /* RCR1 Bits */
+ #define RCR1_CF 0x80 /* Carry Flag */
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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/rts7751r2d/CVS/Entries 2006-07-12 16:54:26.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/
@@ -50449,17 +52151,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/rts7751r2d/CVS/Repository 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/rts7751r2d/CVS/Root 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/rts7751r2d/rts7751r2d.h 2006-07-12 16:54:26.000000000 +0000
@@ -41,8 +41,6 @@
#define PA_AX88796L 0xaa000400 /* AX88796L Area */
@@ -50479,24 +52181,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/saturn/CVS/Entries 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/saturn/CVS/Repository 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/saturn/CVS/Root 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/scatterlist.h 2006-07-12 16:54:26.000000000 +0000
@@ -10,4 +10,13 @@
#define ISA_DMA_THRESHOLD (0x1fffffff)
@@ -50513,7 +52215,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/se.h 2006-07-12 16:54:26.000000000 +0000
@@ -0,0 +1,80 @@
+#ifndef __ASM_SH_HITACHI_SE_H
+#define __ASM_SH_HITACHI_SE_H
@@ -50597,7 +52299,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/se7300.h 2006-07-12 16:54:26.000000000 +0000
@@ -0,0 +1,64 @@
+#ifndef __ASM_SH_HITACHI_SE7300_H
+#define __ASM_SH_HITACHI_SE7300_H
@@ -50665,7 +52367,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/se73180.h 2006-07-12 16:54:26.000000000 +0000
@@ -0,0 +1,65 @@
+#ifndef __ASM_SH_HITACHI_SE73180_H
+#define __ASM_SH_HITACHI_SE73180_H
@@ -50734,7 +52436,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/se7751.h 2006-07-12 16:54:26.000000000 +0000
@@ -0,0 +1,71 @@
+#ifndef __ASM_SH_HITACHI_7751SE_H
+#define __ASM_SH_HITACHI_7751SE_H
@@ -50807,9 +52509,99 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/se7751.h linux-2.6.17/include/asm-
+#include <asm/io_generic.h>
+
+#endif /* __ASM_SH_HITACHI_7751SE_H */
+diff -ruN linux-2.6.17-vanilla/include/asm-sh/sfp-machine.h linux-2.6.17/include/asm-sh/sfp-machine.h
+--- linux-2.6.17-vanilla/include/asm-sh/sfp-machine.h 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.17/include/asm-sh/sfp-machine.h 2006-07-12 16:54:26.000000000 +0000
+@@ -0,0 +1,86 @@
++/* Machine-dependent software floating-point definitions.
++ SuperH kernel version.
++ Copyright (C) 1997,1998,1999 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++ Contributed by Richard Henderson (rth@cygnus.com),
++ Jakub Jelinek (jj@ultra.linux.cz),
++ David S. Miller (davem@redhat.com) and
++ Peter Maydell (pmaydell@chiark.greenend.org.uk).
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Library General Public License as
++ published by the Free Software Foundation; either version 2 of the
++ License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Library General Public License for more details.
++
++ You should have received a copy of the GNU Library General Public
++ License along with the GNU C Library; see the file COPYING.LIB. If
++ not, write to the Free Software Foundation, Inc.,
++ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
++
++#ifndef _SFP_MACHINE_H
++#define _SFP_MACHINE_H
++
++#include <linux/config.h>
++
++#define _FP_W_TYPE_SIZE 32
++#define _FP_W_TYPE unsigned long
++#define _FP_WS_TYPE signed long
++#define _FP_I_TYPE long
++
++#define _FP_MUL_MEAT_S(R,X,Y) \
++ _FP_MUL_MEAT_1_wide(_FP_WFRACBITS_S,R,X,Y,umul_ppmm)
++#define _FP_MUL_MEAT_D(R,X,Y) \
++ _FP_MUL_MEAT_2_wide(_FP_WFRACBITS_D,R,X,Y,umul_ppmm)
++#define _FP_MUL_MEAT_Q(R,X,Y) \
++ _FP_MUL_MEAT_4_wide(_FP_WFRACBITS_Q,R,X,Y,umul_ppmm)
++
++#define _FP_DIV_MEAT_S(R,X,Y) _FP_DIV_MEAT_1_udiv(S,R,X,Y)
++#define _FP_DIV_MEAT_D(R,X,Y) _FP_DIV_MEAT_2_udiv(D,R,X,Y)
++#define _FP_DIV_MEAT_Q(R,X,Y) _FP_DIV_MEAT_4_udiv(Q,R,X,Y)
++
++#define _FP_NANFRAC_S ((_FP_QNANBIT_S << 1) - 1)
++#define _FP_NANFRAC_D ((_FP_QNANBIT_D << 1) - 1), -1
++#define _FP_NANFRAC_Q ((_FP_QNANBIT_Q << 1) - 1), -1, -1, -1
++#define _FP_NANSIGN_S 0
++#define _FP_NANSIGN_D 0
++#define _FP_NANSIGN_Q 0
++
++#define _FP_KEEPNANFRACP 1
++
++/*
++ * If one NaN is signaling and the other is not,
++ * we choose that one, otherwise we choose X.
++ */
++#define _FP_CHOOSENAN(fs, wc, R, X, Y, OP) \
++ do { \
++ if ((_FP_FRAC_HIGH_RAW_##fs(X) & _FP_QNANBIT_##fs) \
++ && !(_FP_FRAC_HIGH_RAW_##fs(Y) & _FP_QNANBIT_##fs)) \
++ { \
++ R##_s = Y##_s; \
++ _FP_FRAC_COPY_##wc(R,Y); \
++ } \
++ else \
++ { \
++ R##_s = X##_s; \
++ _FP_FRAC_COPY_##wc(R,X); \
++ } \
++ R##_c = FP_CLS_NAN; \
++ } while (0)
++
++//#define FP_ROUNDMODE FPSCR_RM
++#define FP_DENORM_ZERO 1/*FPSCR_DN*/
++
++/* Exception flags. */
++#define FP_EX_INVALID (1<<4)
++#define FP_EX_DIVZERO (1<<3)
++#define FP_EX_OVERFLOW (1<<2)
++#define FP_EX_UNDERFLOW (1<<1)
++#define FP_EX_INEXACT (1<<0)
++
++#endif
++
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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/sh03/CVS/Entries 2006-07-12 16:54:26.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/
@@ -50817,17 +52609,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/sh03/CVS/Repository 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/sh03/CVS/Root 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/sh03/io.h 2006-07-12 16:54:26.000000000 +0000
@@ -33,14 +33,6 @@
#define IRL3_IPR_POS 0
#define IRL3_PRIORITY 4
@@ -50846,23 +52638,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/sh2000/CVS/Entries 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/sh2000/CVS/Repository 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/sh2000/CVS/Root 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/smc37c93x.h 2006-07-12 16:54:26.000000000 +0000
@@ -0,0 +1,190 @@
+#ifndef __ASM_SH_SMC37C93X_H
+#define __ASM_SH_SMC37C93X_H
@@ -51056,7 +52848,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/smp.h 2006-07-12 16:54:26.000000000 +0000
@@ -20,11 +20,6 @@
#include <asm/atomic.h>
#include <asm/current.h>
@@ -51071,7 +52863,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/snapgear.h 2006-07-12 16:54:26.000000000 +0000
@@ -0,0 +1,79 @@
+/*
+ * include/asm-sh/snapgear/io.h
@@ -51154,7 +52946,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/system.h 2006-07-12 16:54:26.000000000 +0000
@@ -7,6 +7,7 @@
*/
@@ -51423,7 +53215,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/systemh7751.h 2006-07-12 16:54:26.000000000 +0000
@@ -0,0 +1,71 @@
+#ifndef __ASM_SH_SYSTEMH_7751SYSTEMH_H
+#define __ASM_SH_SYSTEMH_7751SYSTEMH_H
@@ -51498,7 +53290,7 @@ 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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/thread_info.h 2006-07-12 16:54:26.000000000 +0000
@@ -20,7 +20,8 @@
struct exec_domain *exec_domain; /* execution domain */
unsigned long flags; /* low level flags */
@@ -51575,7 +53367,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/thread_info.h linux-2.6.17/include
#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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/timer.h 2006-07-12 16:54:26.000000000 +0000
@@ -6,6 +6,8 @@
struct sys_timer_ops {
@@ -51587,7 +53379,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/timex.h 2006-07-12 16:54:26.000000000 +0000
@@ -6,7 +6,7 @@
#ifndef __ASM_SH_TIMEX_H
#define __ASM_SH_TIMEX_H
@@ -51599,7 +53391,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/titan.h 2006-07-12 16:54:26.000000000 +0000
@@ -0,0 +1,43 @@
+/*
+ * Platform defintions for Titan
@@ -51646,7 +53438,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/asm-sh/uaccess.h 2006-07-12 16:54:26.000000000 +0000
@@ -1,5 +1,4 @@
-/* $Id: uaccess.h,v 1.11 2003/10/13 07:21:20 lethal Exp $
- *
@@ -51779,7 +53571,7 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/uaccess.h linux-2.6.17/include/asm
* 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
++++ linux-2.6.17/include/asm-sh/unistd.h 2006-07-12 16:54:26.000000000 +0000
@@ -300,9 +300,31 @@
#define __NR_inotify_init 290
#define __NR_inotify_add_watch 291
@@ -51816,24 +53608,24 @@ diff -ruN linux-2.6.17-vanilla/include/asm-sh/unistd.h linux-2.6.17/include/asm-
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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/linux/CVS/Entries 2006-07-12 16:54:27.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/linux/CVS/Repository 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/linux/CVS/Root 2006-07-12 16:54:26.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/linux/i2c-id.h 2006-07-12 16:54:27.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 */
@@ -51844,23 +53636,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/video/CVS/Entries 2006-07-12 16:54:27.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/video/CVS/Repository 2006-07-12 16:54:27.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/video/CVS/Root 2006-07-12 16:54:27.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/include/video/voyager.h 2006-07-12 16:54:27.000000000 +0000
@@ -0,0 +1,39 @@
+#define VOY_REG_TOP 0xb3e00000 //voyager register
+#define VOY_VRAM_TOP0 0xb0400000 //PANEL PLANE
@@ -51903,24 +53695,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/lib/CVS/Entries 2006-07-12 16:54:27.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/lib/CVS/Repository 2006-07-12 16:54:27.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/lib/CVS/Root 2006-07-12 16:54:27.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/lib/Kconfig.debug 2006-07-12 16:54:27.000000000 +0000
@@ -178,7 +178,7 @@
config FRAME_POINTER
@@ -51932,7 +53724,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/lib/bitmap.c 2006-07-12 16:54:27.000000000 +0000
@@ -525,7 +525,7 @@
ord = 0;
while (i < pos) {
@@ -51956,23 +53748,23 @@ diff -ruN linux-2.6.17-vanilla/lib/bitmap.c linux-2.6.17/lib/bitmap.c
*/
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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/mm/CVS/Entries 2006-07-12 16:54:27.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/mm/CVS/Repository 2006-07-12 16:54:27.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/mm/CVS/Root 2006-07-12 16:54:27.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/mm/memory.c 2006-07-12 16:54:27.000000000 +0000
@@ -1455,7 +1455,9 @@
int reuse = can_share_swap_page(old_page);
unlock_page(old_page);
@@ -51985,38 +53777,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/net/CVS/Entries 2006-07-12 16:54:27.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/net/CVS/Repository 2006-07-12 16:54:27.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/net/CVS/Root 2006-07-12 16:54:27.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/net/ipv4/CVS/Entries 2006-07-12 16:54:27.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/net/ipv4/CVS/Repository 2006-07-12 16:54:27.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/net/ipv4/CVS/Root 2006-07-12 16:54:27.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/net/ipv4/ipconfig.c 2006-07-12 16:54:27.000000000 +0000
@@ -113,7 +113,7 @@
*/
int ic_set_manually __initdata = 0; /* IPconfig parameters set manually */
@@ -52028,24 +53820,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/scripts/CVS/Entries 2006-07-12 16:54:27.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/scripts/CVS/Repository 2006-07-12 16:54:27.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/scripts/CVS/Root 2006-07-12 16:54:27.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/scripts/treelink.sh 2006-07-12 16:54:27.000000000 +0000
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
@@ -52098,7 +53890,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/scripts/treeunlink.sh 2006-07-12 16:54:27.000000000 +0000
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
@@ -52139,7 +53931,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/sound/CVS/Entries 2006-07-12 16:54:27.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//
@@ -52147,17 +53939,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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/sound/CVS/Repository 2006-07-12 16:54:27.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-07 10:17:07.000000000 +0000
++++ linux-2.6.17/sound/CVS/Root 2006-07-12 16:54:27.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-07 10:17:08.000000000 +0000
++++ linux-2.6.17/sound/Kconfig 2006-07-12 16:54:27.000000000 +0000
@@ -62,6 +62,8 @@
source "sound/mips/Kconfig"
@@ -52169,7 +53961,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-07 10:17:08.000000000 +0000
++++ linux-2.6.17/sound/Makefile 2006-07-12 16:54:27.000000000 +0000
@@ -4,7 +4,7 @@
obj-$(CONFIG_SOUND) += soundcore.o
obj-$(CONFIG_SOUND_PRIME) += oss/
@@ -52181,7 +53973,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-07 10:17:08.000000000 +0000
++++ linux-2.6.17/sound/oss/CVS/Entries 2006-07-12 16:54:27.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/
@@ -52192,17 +53984,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-07 10:17:08.000000000 +0000
++++ linux-2.6.17/sound/oss/CVS/Repository 2006-07-12 16:54:27.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-07 10:17:08.000000000 +0000
++++ linux-2.6.17/sound/oss/CVS/Root 2006-07-12 16:54:27.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-07 10:17:08.000000000 +0000
++++ linux-2.6.17/sound/oss/Kconfig 2006-07-12 16:54:27.000000000 +0000
@@ -833,6 +833,12 @@
tristate "XpressAudio Sound Blaster emulation"
depends on SOUND_SB
@@ -52218,7 +54010,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-07 10:17:08.000000000 +0000
++++ linux-2.6.17/sound/oss/Makefile 2006-07-12 16:54:27.000000000 +0000
@@ -82,6 +82,7 @@
obj-$(CONFIG_SOUND_AD1980) += ac97_plugin_ad1980.o ac97_codec.o
@@ -52229,7 +54021,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-07 10:17:08.000000000 +0000
++++ linux-2.6.17/sound/oss/sh_dac_audio.c 2006-07-12 16:54:27.000000000 +0000
@@ -1,3 +1,14 @@
+/*
+ * sound/oss/sh_dac_audio.c
@@ -52336,7 +54128,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-07 10:17:08.000000000 +0000
++++ linux-2.6.17/sound/oss/voyagergx_8051.c 2006-07-12 16:54:27.000000000 +0000
@@ -0,0 +1,204 @@
+#include <linux/module.h>
+#include <linux/delay.h>
@@ -52544,7 +54336,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-07 10:17:08.000000000 +0000
++++ linux-2.6.17/sound/oss/voyagergx_sound.c 2006-07-12 16:54:27.000000000 +0000
@@ -0,0 +1,1122 @@
+/*
+ * linux/drivers/sound/voyagergx_sound.c -- voyager sound driver
@@ -53670,7 +55462,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-07 10:17:08.000000000 +0000
++++ linux-2.6.17/sound/oss/voyagergx_sound.h 2006-07-12 16:54:27.000000000 +0000
@@ -0,0 +1,4 @@
+#define VOYAGER_8051_COMMAND (VOYAGER_BASE + 0x000c3ff0)
+#define VOYAGER_8051_STATUS (VOYAGER_BASE + 0x000c3ff2)
@@ -53678,26 +55470,26 @@ 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-07 10:17:08.000000000 +0000
++++ linux-2.6.17/sound/sh/CVS/Entries 2006-07-12 16:54:27.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//
-+/aica.c/1.2/Mon Jun 5 15:29:08 2006//
-+/aica.h/1.1/Sun Jun 4 12:13:05 2006//
++/aica.c/1.5/Wed Jul 12 16:52:06 2006//
++/aica.h/1.4/Wed Jul 12 16:52:06 2006//
+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-07 10:17:08.000000000 +0000
++++ linux-2.6.17/sound/sh/CVS/Repository 2006-07-12 16:54:27.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-07 10:17:08.000000000 +0000
++++ linux-2.6.17/sound/sh/CVS/Root 2006-07-12 16:54:27.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-07 10:17:08.000000000 +0000
++++ linux-2.6.17/sound/sh/Kconfig 2006-07-12 16:54:27.000000000 +0000
@@ -0,0 +1,15 @@
+menu "SuperH devices"
+ depends on SND!=n && SUPERH
@@ -53716,7 +55508,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-07 10:17:08.000000000 +0000
++++ linux-2.6.17/sound/sh/Makefile 2006-07-12 16:54:27.000000000 +0000
@@ -0,0 +1,4 @@
+
+snd-aica-objs := aica.o
@@ -53724,8 +55516,8 @@ 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-07 10:17:08.000000000 +0000
-@@ -0,0 +1,681 @@
++++ linux-2.6.17/sound/sh/aica.c 2006-07-12 16:54:27.000000000 +0000
+@@ -0,0 +1,711 @@
+/*
+* This code is licenced under
+* the General Public Licence
@@ -53770,7 +55562,6 @@ diff -ruN linux-2.6.17-vanilla/sound/sh/aica.c linux-2.6.17/sound/sh/aica.c
+#include <sound/info.h>
+#include <asm/io.h>
+#include <asm/dma.h>
-+#include <asm/dreamcast/sysasic.h>
+#include "aica.h"
+
+MODULE_AUTHOR("Adrian McMenamin <adrian@mcmen.demon.co.uk>");
@@ -53778,6 +55569,54 @@ diff -ruN linux-2.6.17-vanilla/sound/sh/aica.c linux-2.6.17/sound/sh/aica.c
+MODULE_LICENSE("GPL");
+MODULE_SUPPORTED_DEVICE("{{Yamaha/SEGA, AICA}}");
+
++/* Command values */
++#define AICA_CMD_KICK 0x80000000
++#define AICA_CMD_NONE 0
++#define AICA_CMD_START 1
++#define AICA_CMD_STOP 2
++#define AICA_CMD_VOL 3
++
++/* Sound modes */
++#define SM_8BIT 1
++#define SM_16BIT 0
++#define SM_ADPCM 2
++
++/* Buffer and period size */
++#define AICA_BUFFER_SIZE 0x8000
++#define AICA_PERIOD_SIZE 0x800
++#define AICA_PERIOD_NUMBER 16
++
++#define AICA_CHANNEL0_OFFSET 0x11000
++#define AICA_CHANNEL1_OFFSET 0x21000
++#define CHANNEL_OFFSET 0x10000
++
++#define AICA_DMA_CHANNEL 0
++#define AICA_DMA_MODE 5
++
++#define SND_AICA_DRIVER "AICA"
++
++struct aica_channel {
++ uint32_t cmd; /* Command ID */
++ uint32_t pos; /* Sample position */
++ uint32_t length; /* Sample length */
++ uint32_t freq; /* Frequency */
++ uint32_t vol; /* Volume 0-255 */
++ uint32_t pan; /* Pan 0-255 */
++ uint32_t sfmt; /* Sound format */
++ uint32_t flags; /* Bit flags */
++};
++
++struct snd_card_aica {
++ struct snd_card *card;
++ struct aica_channel *channel;
++ snd_pcm_substream_t *substream;
++ int clicks;
++ int current_period;
++ struct timer_list timer;
++ int master_volume;
++ int dma_started;
++};
++
+/* module parameters */
+#define CARD_NAME "AICA"
+static int index = -1;
@@ -53805,9 +55644,9 @@ diff -ruN linux-2.6.17-vanilla/sound/sh/aica.c linux-2.6.17/sound/sh/aica.c
+ },
+ {
+ .name = "AICA Sound RAM",
-+ .start = SPU_MEMORY_BASE,
++ .start = AICA_MEMORY_BASE,
+ .flags = IORESOURCE_MEM,
-+ .end = SPU_MEMORY_BASE + 0x200000 - 1,
++ .end = AICA_MEMORY_BASE + AICA_MEMORY_SIZE - 1,
+ },
+};
+
@@ -53834,7 +55673,7 @@ diff -ruN linux-2.6.17-vanilla/sound/sh/aica.c linux-2.6.17/sound/sh/aica.c
+ snd_assert(length % 4 == 0, return);
+ spu_write_wait();
+ for (i = 0; i < length; i++) {
-+ writel(what, toi + SPU_MEMORY_BASE);
++ writel(what, toi + AICA_MEMORY_BASE);
+ toi++;
+ if (i && !(i % 8))
+ spu_write_wait();
@@ -53845,7 +55684,7 @@ diff -ruN linux-2.6.17-vanilla/sound/sh/aica.c linux-2.6.17/sound/sh/aica.c
+static void spu_memload(uint32_t toi, void __iomem * from, int length)
+{
+ uint32_t __iomem *froml = from;
-+ uint32_t __iomem *to = (uint32_t __iomem *) (SPU_MEMORY_BASE + toi);
++ uint32_t __iomem *to = (uint32_t __iomem *) (AICA_MEMORY_BASE + toi);
+ int i, val;
+ if (length % 4)
+ length = (length / 4) + 1;
@@ -53874,10 +55713,10 @@ diff -ruN linux-2.6.17-vanilla/sound/sh/aica.c linux-2.6.17/sound/sh/aica.c
+ writel(regval, ARM_RESET_REGISTER);
+ for (i = 0; i < 64; i++) {
+ spu_write_wait();
-+ regval = readl(SPU_REGISTER_BASE + (i * 0x80));
++ regval = readl(AICA_REGISTER_BASE + (i * 0x80));
+ regval = (regval & ~0x4000) | 0x8000;
+ spu_write_wait();
-+ writel(regval, SPU_REGISTER_BASE + (i * 0x80));
++ writel(regval, AICA_REGISTER_BASE + (i * 0x80));
+ }
+}
+
@@ -53890,17 +55729,16 @@ diff -ruN linux-2.6.17-vanilla/sound/sh/aica.c linux-2.6.17/sound/sh/aica.c
+ writel(regval, ARM_RESET_REGISTER);
+}
+
-+/* Halt the sound processor,
-+ clear the memory,
-+ load some default ARM7 code,
-+ and then restart ARM7
++/*
++ * Halt the sound processor, clear the memory,
++ * load some default ARM7 code, and then restart ARM7
+*/
-+static void spu_init(void)
++static void spu_reset(void)
+{
+ spu_disable();
+ spu_memset(0, 0, 0x200000 / 4);
+ /* Put ARM7 in endless loop */
-+ ctrl_outl(0xea000002, SPU_MEMORY_BASE);
++ ctrl_outl(0xea000002, AICA_MEMORY_BASE);
+ spu_enable();
+}
+
@@ -53964,20 +55802,45 @@ diff -ruN linux-2.6.17-vanilla/sound/sh/aica.c linux-2.6.17/sound/sh/aica.c
+ return err;
+}
+
-+static void more_spu_dma(void *sstream)
++static void startup_aica(struct snd_card_aica *dreamcastcard)
++{
++ spu_memload(AICA_CHANNEL0_CONTROL_OFFSET,
++ (uint8_t *) dreamcastcard->channel,
++ sizeof(struct aica_channel));
++ aica_chn_start();
++}
++
++
++static void execute_spu_dma(void *sstream)
+{
++ int buffer_size;
+ struct snd_pcm_substream *substream;
+ struct snd_pcm_runtime *runtime;
+ struct snd_card_aica *dreamcastcard;
+ substream = sstream;
+ dreamcastcard = substream->pcm->private_data;
+ runtime = substream->runtime;
-+ aica_dma_transfer(runtime->channels,
++ if (unlikely(dreamcastcard->dma_started == 0))
++ {
++ buffer_size = frames_to_bytes(runtime, runtime->buffer_size);
++ if (runtime->channels > 1)
++ dreamcastcard->channel->flags |= 0x01;
++ aica_dma_transfer(runtime->channels, buffer_size, substream);
++ startup_aica(dreamcastcard);
++ dreamcastcard->clicks =
++ buffer_size / (AICA_PERIOD_SIZE * runtime->channels);
++ dreamcastcard->dma_started = 1;
++ }
++ else
++ {
++ aica_dma_transfer(runtime->channels,
+ AICA_PERIOD_SIZE * runtime->channels, substream);
-+ snd_pcm_period_elapsed(dreamcastcard->substream);
-+ dreamcastcard->clicks++;
-+ dreamcastcard->clicks %= AICA_PERIOD_NUMBER;
-+ mod_timer(&dreamcastcard->timer, jiffies + 1);
++ snd_pcm_period_elapsed(dreamcastcard->substream);
++ dreamcastcard->clicks++;
++ dreamcastcard->clicks %= AICA_PERIOD_NUMBER;
++ mod_timer(&dreamcastcard->timer, jiffies+1);
++ }
++
+}
+
+static void aica_period_elapsed(unsigned long timer_var)
@@ -53998,13 +55861,11 @@ diff -ruN linux-2.6.17-vanilla/sound/sh/aica.c linux-2.6.17/sound/sh/aica.c
+ AICA_PERIOD_SIZE;
+ if (play_period == dreamcastcard->current_period) {
+ /* reschedule the timer */
-+ dreamcastcard->timer.expires = jiffies + 1;
-+ add_timer(&(dreamcastcard->timer));
++ mod_timer(&dreamcastcard->timer, jiffies+1);
+ return;
+ }
+ if (runtime->channels > 1)
+ dreamcastcard->current_period = play_period;
-+ PREPARE_WORK(&spu_dma_work, more_spu_dma, substream);
+ queue_work(aica_queue, &spu_dma_work);
+}
+
@@ -54033,6 +55894,7 @@ diff -ruN linux-2.6.17-vanilla/sound/sh/aica.c linux-2.6.17/sound/sh/aica.c
+ spu_enable();
+ dreamcastcard->clicks = 0;
+ dreamcastcard->current_period = 0;
++ dreamcastcard->dma_started = 0;
+ return 0;
+}
+
@@ -54073,31 +55935,7 @@ diff -ruN linux-2.6.17-vanilla/sound/sh/aica.c linux-2.6.17/sound/sh/aica.c
+ return 0;
+}
+
-+static void startup_aica(struct snd_card_aica *dreamcastcard)
-+{
-+ spu_memload(AICA_CHANNEL0_CONTROL_OFFSET,
-+ (uint8_t *) dreamcastcard->channel,
-+ sizeof(struct aica_channel));
-+ aica_chn_start();
-+}
+
-+static void start_spu_dma(void *sstream)
-+{
-+ int buffer_size;
-+ struct snd_pcm_substream *substream;
-+ struct snd_pcm_runtime *runtime;
-+ struct snd_card_aica *dreamcastcard;
-+ substream = sstream;
-+ dreamcastcard = substream->pcm->private_data;
-+ runtime = substream->runtime;
-+ buffer_size = frames_to_bytes(runtime, runtime->buffer_size);
-+ if (runtime->channels > 1)
-+ dreamcastcard->channel->flags |= 0x01;
-+ aica_dma_transfer(runtime->channels, buffer_size, substream);
-+ startup_aica(dreamcastcard);
-+ dreamcastcard->clicks =
-+ buffer_size / (AICA_PERIOD_SIZE * runtime->channels);
-+}
+
+static void spu_begin_dma(struct snd_pcm_substream *substream)
+{
@@ -54107,13 +55945,8 @@ diff -ruN linux-2.6.17-vanilla/sound/sh/aica.c linux-2.6.17/sound/sh/aica.c
+ runtime = substream->runtime;
+ dreamcastcard = substream->pcm->private_data;
+ /* Use queue to do the heavy lifting */
-+ INIT_WORK(&spu_dma_work, start_spu_dma, substream);
++ INIT_WORK(&spu_dma_work, execute_spu_dma, substream);
+ queue_work(aica_queue, &spu_dma_work);
-+ /* Timer may already be running */
-+ if (unlikely(dreamcastcard->timer.data)) {
-+ mod_timer(&dreamcastcard->timer, jiffies + 4);
-+ return;
-+ }
+ init_timer(&(dreamcastcard->timer));
+ dreamcastcard->timer.data = (unsigned long)substream;
+ dreamcastcard->timer.function = aica_period_elapsed;
@@ -54166,7 +55999,7 @@ diff -ruN linux-2.6.17-vanilla/sound/sh/aica.c linux-2.6.17/sound/sh/aica.c
+ int err;
+ /* AICA has no capture ability */
+ err =
-+ snd_pcm_new(dreamcastcard->card, "AICA PCM", pcm_index, 1, 0, &pcm)
++ snd_pcm_new(dreamcastcard->card, "AICA PCM", pcm_index, 1, 0, &pcm);
+ if (unlikely(err < 0))
+ return err;
+ pcm->private_data = dreamcastcard;
@@ -54270,35 +56103,12 @@ diff -ruN linux-2.6.17-vanilla/sound/sh/aica.c linux-2.6.17/sound/sh/aica.c
+ .put = aica_pcmvolume_put
+};
+
-+static int remove_dreamcastcard(struct device *dreamcast_device)
-+{
-+ struct snd_card_aica *dreamcastcard = dreamcast_device->driver_data;
-+ snd_card_free(dreamcastcard->card);
-+ kfree(dreamcastcard);
-+ return 0;
-+}
-+
-+static struct device_driver aica_driver = {
-+ .name = "AICA",
-+ .bus = &platform_bus_type,
-+ .remove = remove_dreamcastcard,
-+};
-+
-+/* Fill up the members of the embedded device structure */
-+static void populate_dreamcastaicadev(struct device *dev)
-+{
-+ dev->bus = &platform_bus_type;
-+ dev->driver = &aica_driver;
-+ driver_register(dev->driver);
-+ device_bind_driver(dev);
-+}
-+
+static int load_aica_firmware(void)
+{
+ int err;
+ const struct firmware *fw_entry;
+ err = 0;
-+ spu_init();
++ spu_reset();
+ err = request_firmware(&fw_entry, "aica_firmware.bin", &pd->dev);
+ if (unlikely(err))
+ return err;
@@ -54327,44 +56137,37 @@ diff -ruN linux-2.6.17-vanilla/sound/sh/aica.c linux-2.6.17/sound/sh/aica.c
+ return 0;
+}
+
-+static int __init aica_init(void)
++static int snd_aica_remove(struct platform_device *devptr)
++{
++ snd_card_free(platform_get_drvdata(devptr));
++ platform_set_drvdata(devptr, NULL);
++ return 0;
++}
++
++static int __init snd_aica_probe(struct platform_device *devptr)
+{
+ int err;
+ struct snd_card_aica *dreamcastcard;
-+ /* Are we in a Dreamcast at all? */
-+ if (unlikely(!mach_is_dreamcast()))
-+ return -ENODEV;
++
+ dreamcastcard = kmalloc(sizeof(struct snd_card_aica), GFP_KERNEL);
+ if (unlikely(!dreamcastcard))
+ return -ENOMEM;
-+ dreamcastcard->card = snd_card_new(index, "AICA", THIS_MODULE, 0);
++ dreamcastcard->card =
++ snd_card_new(index, SND_AICA_DRIVER, THIS_MODULE, 0);
+ if (unlikely(!dreamcastcard->card)) {
+ kfree(dreamcastcard);
+ return -ENODEV;
+ }
+ strcpy(dreamcastcard->card->driver, "snd_aica");
-+ strcpy(dreamcastcard->card->shortname, "AICA");
++ strcpy(dreamcastcard->card->shortname, SND_AICA_DRIVER);
+ strcpy(dreamcastcard->card->longname,
+ "Yamaha AICA Super Intelligent Sound Processor for SEGA Dreamcast");
+ /* Load the PCM 'chip' */
+ err = snd_aicapcmchip(dreamcastcard, 0);
+ if (unlikely(err < 0))
+ goto freedreamcast;
-+ pd = platform_device_register_simple(dreamcastcard->card->driver,
-+ -1, aica_memory_space, 2);
-+ if (unlikely(IS_ERR(pd))) {
-+ err = PTR_ERR(pd);
-+ goto freepcm;
-+ }
-+ populate_dreamcastaicadev(&pd->dev);
-+ snd_card_set_dev(dreamcastcard->card, &pd->dev);
-+ pd->dev.driver_data = dreamcastcard;
-+ dreamcastcard->timer.data = 0;
++ snd_card_set_dev(dreamcastcard->card, &devptr->dev);
+ dreamcastcard->channel = NULL;
-+ /* Load the firmware */
-+ err = load_aica_firmware();
-+ if (unlikely(err < 0))
-+ goto freedreamcast;
+ /* Add basic controls */
+ err = add_aicamixer_controls(dreamcastcard);
+ if (unlikely(err < 0))
@@ -54373,128 +56176,104 @@ diff -ruN linux-2.6.17-vanilla/sound/sh/aica.c linux-2.6.17/sound/sh/aica.c
+ err = snd_card_register(dreamcastcard->card);
+ if (unlikely(err < 0))
+ goto freedreamcast;
++ platform_set_drvdata(devptr, dreamcastcard->card);
+ aica_queue = create_workqueue("aica");
+ if (unlikely(!aica_queue))
+ goto freedreamcast;
+ snd_printk
+ ("ALSA Driver for Yamaha AICA Super Intelligent Sound Processor\n");
+ return 0;
-+ freepcm:
+ freedreamcast:
+ snd_card_free(dreamcastcard->card);
-+ if (pd) {
-+ struct device_driver *drv = (&pd->dev)->driver;
-+ device_release_driver(&pd->dev);
-+ driver_unregister(drv);
-+ platform_device_unregister(pd);
-+ pd = NULL;
-+ }
+ kfree(dreamcastcard);
+ return err;
+}
+
++static struct platform_driver snd_aica_driver = {
++ .probe = snd_aica_probe,
++ .remove = snd_aica_remove,
++ .driver = {
++ .name = SND_AICA_DRIVER
++ },
++};
++
++static int __init aica_init(void) {
++ int err;
++ err = platform_driver_register(&snd_aica_driver);
++ if (unlikely(err < 0)) return err;
++ pd = platform_device_register_simple(SND_AICA_DRIVER, -1,
++ aica_memory_space, 2);
++ if (unlikely(IS_ERR(pd))) {
++ platform_driver_unregister(&snd_aica_driver);
++ return PTR_ERR(pd);
++ }
++ err = load_aica_firmware();
++ if (unlikely(err < 0)) {
++ platform_driver_unregister(&snd_aica_driver);
++ platform_device_unregister(pd);
++ return err;
++ }
++ return 0;
++}
++
+static void __exit aica_exit(void)
+{
-+ struct device_driver *drv = (&pd->dev)->driver;
-+ flush_workqueue(aica_queue);
++ /* Flush and destroy the aica kernel thread */
+ destroy_workqueue(aica_queue);
-+ device_release_driver(&pd->dev);
-+ driver_unregister(drv);
+ platform_device_unregister(pd);
++ platform_driver_unregister(&snd_aica_driver);
+ /* Kill any sound still playing and reset ARM7 to safe state */
-+ spu_init();
++ spu_reset();
+}
+
+module_init(aica_init);
+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-07 10:17:08.000000000 +0000
-@@ -0,0 +1,87 @@
-+/* aica.h
-+ * Header file for ALSA driver for
-+ * Sega Dreamcast Yamaha AICA sound
-+ * Copyright Adrian McMenamin
-+ * <adrian@mcmen.demon.co.uk>
-+ * 2006
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of version 2 of the GNU General Public License as published by
-+ * the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ *
-+ */
++++ linux-2.6.17/sound/sh/aica.h 2006-07-12 16:54:27.000000000 +0000
+@@ -0,0 +1,44 @@
++/*
++* This code is licenced under
++* the General Public Licence
++* version 2
++*
++* Copyright Adrian McMenamin 2006
++* <adrian@mcmen.demon.co.uk>
++* See also http://newgolddream.dyndns.info/cgi-bin/cvsweb
++*
++*
++* This program is free software; you can redistribute it and/or modify
++* it under the terms of version 2 of the GNU General Public License as published by
++* the Free Software Foundation.
++*
++* This program is distributed in the hope that it will be useful,
++* but WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++* GNU General Public License for more details.
++*
++* You should have received a copy of the GNU General Public License
++* along with this program; if not, write to the Free Software
++* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++*
++*/
++
++#ifndef _ASM_DREAMCAST_AICA
++#define _ASM_DREAMCAST_AICA
+
++#ifdef MACH_DREAMCAST
+/* SPU memory and register constants etc */
+#define G2_FIFO 0xa05f688c
-+#define SPU_MEMORY_BASE 0xA0800000
++#define AICA_MEMORY_BASE 0xA0800000
+#define ARM_RESET_REGISTER 0xA0702C00
-+#define SPU_REGISTER_BASE 0xA0700000
-+
-+
++#define AICA_REGISTER_BASE 0xA0700000
+
+/* AICA channels stuff */
-+
+#define AICA_CONTROL_POINT 0xA0810000
+#define AICA_CONTROL_CHANNEL_SAMPLE_NUMBER 0xA0810008
++#define AICA_MEMORY_SIZE 0x200000
+#define AICA_CHANNEL0_CONTROL_OFFSET 0x10004
++#endif
+
-+/* Command values */
-+#define AICA_CMD_KICK 0x80000000
-+#define AICA_CMD_NONE 0
-+#define AICA_CMD_START 1
-+#define AICA_CMD_STOP 2
-+#define AICA_CMD_VOL 3
-+
-+/* Sound modes */
-+#define SM_8BIT 1
-+#define SM_16BIT 0
-+#define SM_ADPCM 2
-+
-+/* Buffer and period size */
-+#define AICA_BUFFER_SIZE 0x8000
-+#define AICA_PERIOD_SIZE 0x800
-+#define AICA_PERIOD_NUMBER 16
-+
-+#define AICA_CHANNEL0_OFFSET 0x11000
-+#define AICA_CHANNEL1_OFFSET 0x21000
-+#define CHANNEL_OFFSET 0x10000
-+
-+#define AICA_DMA_CHANNEL 0
-+#define AICA_DMA_MODE 5
-+
-+
-+struct aica_channel {
-+ uint32_t cmd; /* Command ID */
-+ uint32_t pos; /* Sample position */
-+ uint32_t length; /* Sample length */
-+ uint32_t freq; /* Frequency */
-+ uint32_t vol; /* Volume 0-255 */
-+ uint32_t pan; /* Pan 0-255 */
-+ uint32_t sfmt; /* Sound format */
-+ uint32_t flags; /* Bit flags */
-+};
-+
-+
-+struct snd_card_aica {
-+ struct snd_card *card;
-+ struct aica_channel *channel;
-+ snd_pcm_substream_t *substream;
-+ int clicks;
-+ int current_period;
-+ struct timer_list timer;
-+ int master_volume;
-+ struct work_struct work;
-+ struct work_struct work2;
-+ struct workqueue_struct *workqueue;
-+};
-+
++#endif
+
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 a0f2cc8c2e..2ad9b09cc8 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
-# Fri Jul 7 14:14:14 2006
+# Wed Jul 12 17:39:16 2006
#
CONFIG_SUPERH=y
CONFIG_RWSEM_GENERIC_SPINLOCK=y
@@ -14,7 +14,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y
#
# Code maturity level options
#
-CONFIG_EXPERIMENTAL=y
+# CONFIG_EXPERIMENTAL is not set
CONFIG_BROKEN_ON_SMP=y
CONFIG_INIT_ENV_ARG_LIMIT=32
@@ -25,7 +25,6 @@ CONFIG_LOCALVERSION=""
CONFIG_LOCALVERSION_AUTO=y
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
CONFIG_BSD_PROCESS_ACCT=y
# CONFIG_BSD_PROCESS_ACCT_V3 is not set
CONFIG_SYSCTL=y
@@ -35,7 +34,6 @@ CONFIG_IKCONFIG_PROC=y
# CONFIG_RELAY is not set
CONFIG_INITRAMFS_SOURCE=""
CONFIG_UID16=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
# CONFIG_EMBEDDED is not set
CONFIG_KALLSYMS=y
# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -57,7 +55,6 @@ CONFIG_BASE_SMALL=0
#
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
# CONFIG_MODVERSIONS is not set
# CONFIG_MODULE_SRCVERSION_ALL is not set
CONFIG_KMOD=y
@@ -162,10 +159,6 @@ CONFIG_CPU_SUBTYPE_SH7709=y
# Memory management options
#
CONFIG_MMU=y
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
# CONFIG_SPARSEMEM_STATIC is not set
@@ -222,8 +215,6 @@ CONFIG_HD64461_ENABLER=y
#
# Kernel features
#
-# CONFIG_KEXEC is not set
-# CONFIG_PREEMPT is not set
# CONFIG_SMP is not set
#
@@ -246,7 +237,6 @@ CONFIG_ISA=y
CONFIG_PCCARD=y
# CONFIG_PCMCIA_DEBUG is not set
CONFIG_PCMCIA=y
-CONFIG_PCMCIA_LOAD_CIS=y
CONFIG_PCMCIA_IOCTL=y
#
@@ -270,14 +260,6 @@ CONFIG_BINFMT_ELF=y
# CONFIG_BINFMT_MISC is not set
#
-# Power management options (EXPERIMENTAL)
-#
-CONFIG_PM=y
-CONFIG_PM_LEGACY=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_APM=y
-
-#
# Networking
#
CONFIG_NET=y
@@ -305,7 +287,6 @@ CONFIG_IP_MULTIPLE_TABLES=y
# 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
# CONFIG_INET_ESP is not set
@@ -320,33 +301,12 @@ CONFIG_TCP_CONG_BIC=y
# CONFIG_INET6_XFRM_TUNNEL is not set
# CONFIG_INET6_TUNNEL is not set
# CONFIG_NETFILTER is not set
-
-#
-# DCCP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_DCCP is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_SCTP is not set
-
-#
-# TIPC Configuration (EXPERIMENTAL)
-#
-# CONFIG_TIPC is not set
-# CONFIG_ATM is not set
# CONFIG_BRIDGE is not set
# CONFIG_VLAN_8021Q is not set
# CONFIG_DECNET is not set
# CONFIG_LLC2 is not set
# CONFIG_IPX is not set
# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
#
# QoS and/or fair queueing
@@ -427,8 +387,6 @@ CONFIG_IEEE80211=y
CONFIG_IEEE80211_CRYPT_WEP=y
CONFIG_IEEE80211_CRYPT_CCMP=y
CONFIG_IEEE80211_CRYPT_TKIP=y
-CONFIG_IEEE80211_SOFTMAC=y
-# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
CONFIG_WIRELESS_EXT=y
#
@@ -495,7 +453,6 @@ CONFIG_BLK_DEV_IDEDISK=y
CONFIG_IDEDISK_MULTI_MODE=y
CONFIG_BLK_DEV_IDECS=y
# CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDETAPE is not set
# CONFIG_BLK_DEV_IDEFLOPPY is not set
CONFIG_IDE_TASK_IOCTL=y
@@ -570,7 +527,6 @@ CONFIG_MII=m
# CONFIG_NET_VENDOR_SMC is not set
# CONFIG_SMC91X is not set
# CONFIG_NET_VENDOR_RACAL is not set
-# CONFIG_AT1700 is not set
# CONFIG_DEPCA is not set
# CONFIG_HP100 is not set
# CONFIG_NET_ISA is not set
@@ -623,7 +579,6 @@ CONFIG_PCMCIA_HERMES=m
CONFIG_PCMCIA_SPECTRUM=m
CONFIG_AIRO_CS=m
CONFIG_PCMCIA_ATMEL=m
-CONFIG_PCMCIA_WL3501=m
CONFIG_HOSTAP=m
CONFIG_HOSTAP_FIRMWARE=y
CONFIG_HOSTAP_FIRMWARE_NVRAM=y
@@ -648,20 +603,15 @@ CONFIG_PCMCIA_AXNET=m
#
# CONFIG_WAN is not set
CONFIG_PPP=m
-# CONFIG_PPP_MULTILINK is not set
# CONFIG_PPP_FILTER is not set
CONFIG_PPP_ASYNC=m
CONFIG_PPP_SYNC_TTY=m
CONFIG_PPP_DEFLATE=m
CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOE=m
CONFIG_SLIP=m
# CONFIG_SLIP_COMPRESSED is not set
# CONFIG_SLIP_SMART is not set
# CONFIG_SLIP_MODE_SLIP6 is not set
-# CONFIG_SHAPER is not set
-# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
# CONFIG_NET_POLL_CONTROLLER is not set
@@ -777,8 +727,6 @@ CONFIG_LEGACY_PTY_COUNT=8
#
# TPM devices
#
-# CONFIG_TCG_TPM is not set
-# CONFIG_TELCLOCK is not set
#
# I2C support
@@ -798,19 +746,11 @@ CONFIG_I2C_CHARDEV=y
#
# 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
@@ -833,38 +773,13 @@ CONFIG_I2C_CHARDEV=y
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
#
@@ -921,7 +836,12 @@ CONFIG_FONT_PEARL_8x8=y
# Logo configuration
#
# CONFIG_LOGO is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_DEVICE=y
+CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_LCD_DEVICE=y
+CONFIG_BACKLIGHT_HP680=y
#
# Sound
@@ -988,7 +908,6 @@ CONFIG_SOUND_SH_DAC_AUDIO_CHANNEL=1
#
# Real Time Clock
#
-# CONFIG_RTC_CLASS is not set
#
# File systems
@@ -1004,7 +923,6 @@ CONFIG_JBD=y
# CONFIG_JFS_FS is not set
# CONFIG_FS_POSIX_ACL is not set
# CONFIG_XFS_FS is not set
-# CONFIG_OCFS2_FS is not set
# CONFIG_MINIX_FS is not set
# CONFIG_ROMFS_FS is not set
# CONFIG_INOTIFY is not set
@@ -1040,18 +958,11 @@ CONFIG_TMPFS=y
# CONFIG_HUGETLBFS is not set
# CONFIG_HUGETLB_PAGE is not set
CONFIG_RAMFS=y
-# CONFIG_CONFIGFS_FS is not set
#
# Miscellaneous filesystems
#
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
# CONFIG_CRAMFS is not set
# CONFIG_VXFS_FS is not set
# CONFIG_HPFS_FS is not set
@@ -1065,27 +976,20 @@ CONFIG_RAMFS=y
CONFIG_NFS_FS=m
CONFIG_NFS_V3=y
# CONFIG_NFS_V3_ACL is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
CONFIG_NFSD=m
CONFIG_NFSD_V3=y
# CONFIG_NFSD_V3_ACL is not set
-# CONFIG_NFSD_V4 is not set
CONFIG_NFSD_TCP=y
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_EXPORTFS=m
CONFIG_NFS_COMMON=y
CONFIG_SUNRPC=m
-# CONFIG_RPCSEC_GSS_KRB5 is not set
-# CONFIG_RPCSEC_GSS_SPKM3 is not set
CONFIG_SMB_FS=m
# CONFIG_SMB_NLS_DEFAULT is not set
# CONFIG_CIFS is not set
# CONFIG_NCP_FS is not set
# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
-# CONFIG_9P_FS is not set
#
# Partition Types
@@ -1138,11 +1042,6 @@ CONFIG_NLS_KOI8_U=m
CONFIG_NLS_UTF8=m
#
-# Profiling support
-#
-# CONFIG_PROFILING is not set
-
-#
# Kernel hacking
#
# CONFIG_PRINTK_TIME is not set
@@ -1196,7 +1095,7 @@ CONFIG_CRYPTO_TEST=m
# Library routines
#
CONFIG_CRC_CCITT=y
-# CONFIG_CRC16 is not set
+CONFIG_CRC16=y
CONFIG_CRC32=y
CONFIG_LIBCRC32C=y
CONFIG_ZLIB_INFLATE=m
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 14:12:19 +0000