diff --git a/attic/linux24-psionw/05-devfs-not-exp.patch b/attic/linux24-psionw/05-devfs-not-exp.patch deleted file mode 100644 index dd5b19000..000000000 --- a/attic/linux24-psionw/05-devfs-not-exp.patch +++ /dev/null @@ -1,40 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../linux24-psionw/05-devfs-not-exp.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# Copyright (C) 1998 - 2003 Clifford Wolf -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -Currently (at version 2.0.x) ROCK Linux required DevFS. It is highly -useful. Later version of ROCK Linux are planed to support other variants -(like old-style device nodes or udevfs). - - - Rene Rebe - ---- linux-2.4.23/fs/Config.in.orig 2003-11-28 19:26:21.000000000 +0100 -+++ linux-2.4.23/fs/Config.in 2003-12-09 00:55:11.000000000 +0100 -@@ -72,13 +72,9 @@ - - bool '/proc file system support' CONFIG_PROC_FS - --# For some reason devfs corrupts memory badly on x86-64. Disable it --# for now. --if [ "$CONFIG_X86_64" != "y" ] ; then --dep_bool '/dev file system support (EXPERIMENTAL)' CONFIG_DEVFS_FS $CONFIG_EXPERIMENTAL -+dep_bool '/dev file system support (Required for ROCK Linux)' CONFIG_DEVFS_FS $CONFIG_EXPERIMENTAL - dep_bool ' Automatically mount at boot' CONFIG_DEVFS_MOUNT $CONFIG_DEVFS_FS - dep_bool ' Debug devfs' CONFIG_DEVFS_DEBUG $CONFIG_DEVFS_FS --fi - - # It compiles as a module for testing only. It should not be used - # as a module in general. If we make this "tristate", a bunch of people diff --git a/attic/linux24-psionw/06-devfs-default.patch b/attic/linux24-psionw/06-devfs-default.patch deleted file mode 100644 index 93130582d..000000000 --- a/attic/linux24-psionw/06-devfs-default.patch +++ /dev/null @@ -1,183 +0,0 @@ - --- T2-COPYRIGHT-NOTE-BEGIN --- - This copyright note is auto-generated by ./scripts/Create-CopyPatch. - - T2 SDE: package/.../linux24-psionw/06-devfs-default.patch - Copyright (C) 2004 - 2006 The T2 SDE Project - Copyright (C) 1998 - 2003 Clifford Wolf - - More information can be found in the files COPYING and README. - - This patch file is dual-licensed. It is available under the license the - patched project is licensed under, as long as it is an OpenSource license - as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms - of the GNU General Public License as published by the Free Software - Foundation; either version 2 of the License, or (at your option) any later - version. -# --- T2-COPYRIGHT-NOTE-END --- - -diff -rduN ./arch/alpha/defconfig ./arch/alpha/defconfig ---- ./arch/alpha/defconfig 2004-02-18 14:36:30.000000000 +0100 -+++ ./arch/alpha/defconfig 2004-04-20 00:03:27.000000000 +0200 -@@ -567,8 +567,8 @@ - # CONFIG_NTFS_RW is not set - # CONFIG_HPFS_FS is not set - CONFIG_PROC_FS=y --# CONFIG_DEVFS_FS is not set --# CONFIG_DEVFS_MOUNT is not set -+CONFIG_DEVFS_FS=y -+CONFIG_DEVFS_MOUNT=y - # CONFIG_DEVFS_DEBUG is not set - CONFIG_DEVPTS_FS=y - # CONFIG_QNX4FS_FS is not set -diff -rduN ./arch/arm/defconfig ./arch/arm/defconfig ---- ./arch/arm/defconfig 2004-02-18 14:36:30.000000000 +0100 -+++ ./arch/arm/defconfig 2004-04-20 00:13:05.000000000 +0200 -@@ -422,8 +422,8 @@ - # CONFIG_NTFS_RW is not set - # CONFIG_HPFS_FS is not set - CONFIG_PROC_FS=y --# CONFIG_DEVFS_FS is not set --# CONFIG_DEVFS_MOUNT is not set -+CONFIG_DEVFS_FS=y -+CONFIG_DEVFS_MOUNT=y - # CONFIG_DEVFS_DEBUG is not set - CONFIG_DEVPTS_FS=y - # CONFIG_QNX4FS_FS is not set -diff -rduN ./arch/cris/defconfig ./arch/cris/defconfig ---- ./arch/cris/defconfig 2004-02-18 14:36:30.000000000 +0100 -+++ ./arch/cris/defconfig 2004-04-20 00:18:07.000000000 +0200 -@@ -457,8 +457,8 @@ - # CONFIG_NTFS_RW is not set - # CONFIG_HPFS_FS is not set - CONFIG_PROC_FS=y --# CONFIG_DEVFS_FS is not set --# CONFIG_DEVFS_MOUNT is not set -+CONFIG_DEVFS_FS=y -+CONFIG_DEVFS_MOUNT=y - # CONFIG_DEVFS_DEBUG is not set - # CONFIG_DEVPTS_FS is not set - # CONFIG_QNX4FS_FS is not set -diff -rduN ./arch/i386/defconfig ./arch/i386/defconfig ---- ./arch/i386/defconfig 2004-04-14 15:05:25.000000000 +0200 -+++ ./arch/i386/defconfig 2004-04-20 00:01:37.000000000 +0200 -@@ -711,8 +711,8 @@ - # CONFIG_NTFS_RW is not set - # CONFIG_HPFS_FS is not set - CONFIG_PROC_FS=y --# CONFIG_DEVFS_FS is not set --# CONFIG_DEVFS_MOUNT is not set -+CONFIG_DEVFS_FS=y -+CONFIG_DEVFS_MOUNT=y - # CONFIG_DEVFS_DEBUG is not set - CONFIG_DEVPTS_FS=y - # CONFIG_QNX4FS_FS is not set -diff -rduN ./arch/ia64/defconfig ./arch/ia64/defconfig ---- ./arch/ia64/defconfig 2004-02-18 14:36:30.000000000 +0100 -+++ ./arch/ia64/defconfig 2004-04-20 00:15:28.000000000 +0200 -@@ -721,8 +721,8 @@ - # CONFIG_NTFS_RW is not set - # CONFIG_HPFS_FS is not set - CONFIG_PROC_FS=y --# CONFIG_DEVFS_FS is not set --# CONFIG_DEVFS_MOUNT is not set -+CONFIG_DEVFS_FS=y -+CONFIG_DEVFS_MOUNT=y - # CONFIG_DEVFS_DEBUG is not set - CONFIG_DEVPTS_FS=y - # CONFIG_QNX4FS_FS is not set -diff -rduN ./arch/m68k/defconfig ./arch/m68k/defconfig ---- ./arch/m68k/defconfig 2004-02-18 14:36:30.000000000 +0100 -+++ ./arch/m68k/defconfig 2004-04-20 00:07:43.000000000 +0200 -@@ -229,8 +229,8 @@ - # CONFIG_NTFS_FS is not set - # CONFIG_HPFS_FS is not set - CONFIG_PROC_FS=y --# CONFIG_DEVFS_FS is not set --# CONFIG_DEVFS_MOUNT is not set -+CONFIG_DEVFS_FS=y -+CONFIG_DEVFS_MOUNT=y - # CONFIG_DEVFS_DEBUG is not set - CONFIG_DEVPTS_FS=y - # CONFIG_QNX4FS_FS is not set -diff -rduN ./arch/mips/defconfig ./arch/mips/defconfig ---- ./arch/mips/defconfig 2004-02-18 14:36:30.000000000 +0100 -+++ ./arch/mips/defconfig 2004-04-20 00:05:33.000000000 +0200 -@@ -577,8 +577,8 @@ - # CONFIG_NTFS_RW is not set - # CONFIG_HPFS_FS is not set - CONFIG_PROC_FS=y --# CONFIG_DEVFS_FS is not set --# CONFIG_DEVFS_MOUNT is not set -+CONFIG_DEVFS_FS=y -+CONFIG_DEVFS_MOUNT=y - # CONFIG_DEVFS_DEBUG is not set - CONFIG_DEVPTS_FS=y - # CONFIG_QNX4FS_FS is not set -diff -rduN ./arch/mips64/defconfig ./arch/mips64/defconfig ---- ./arch/mips64/defconfig 2004-02-18 14:36:30.000000000 +0100 -+++ ./arch/mips64/defconfig 2004-04-20 00:16:20.000000000 +0200 -@@ -533,8 +533,8 @@ - # CONFIG_NTFS_RW is not set - # CONFIG_HPFS_FS is not set - CONFIG_PROC_FS=y --# CONFIG_DEVFS_FS is not set --# CONFIG_DEVFS_MOUNT is not set -+CONFIG_DEVFS_FS=y -+CONFIG_DEVFS_MOUNT=y - # CONFIG_DEVFS_DEBUG is not set - CONFIG_DEVPTS_FS=y - # CONFIG_QNX4FS_FS is not set -diff -rduN ./arch/parisc/defconfig ./arch/parisc/defconfig ---- ./arch/parisc/defconfig 2004-02-18 14:36:30.000000000 +0100 -+++ ./arch/parisc/defconfig 2004-04-20 00:17:32.000000000 +0200 -@@ -617,8 +617,8 @@ - # CONFIG_NTFS_RW is not set - # CONFIG_HPFS_FS is not set - CONFIG_PROC_FS=y --# CONFIG_DEVFS_FS is not set --# CONFIG_DEVFS_MOUNT is not set -+CONFIG_DEVFS_FS=y -+CONFIG_DEVFS_MOUNT=y - # CONFIG_DEVFS_DEBUG is not set - CONFIG_DEVPTS_FS=y - # CONFIG_QNX4FS_FS is not set -diff -rduN ./arch/ppc/defconfig ./arch/ppc/defconfig ---- ./arch/ppc/defconfig 2004-02-18 14:36:30.000000000 +0100 -+++ ./arch/ppc/defconfig 2004-04-20 00:06:02.000000000 +0200 -@@ -789,7 +789,7 @@ - # CONFIG_HPFS_FS is not set - CONFIG_PROC_FS=y - CONFIG_DEVFS_FS=y --# CONFIG_DEVFS_MOUNT is not set -+CONFIG_DEVFS_MOUNT=y - # CONFIG_DEVFS_DEBUG is not set - CONFIG_DEVPTS_FS=y - # CONFIG_QNX4FS_FS is not set -diff -rduN ./arch/sh/defconfig ./arch/sh/defconfig ---- ./arch/sh/defconfig 2004-02-18 14:36:30.000000000 +0100 -+++ ./arch/sh/defconfig 2004-04-20 00:14:05.000000000 +0200 -@@ -167,8 +167,8 @@ - # CONFIG_NTFS_RW is not set - # CONFIG_HPFS_FS is not set - CONFIG_PROC_FS=y --# CONFIG_DEVFS_FS is not set --# CONFIG_DEVFS_MOUNT is not set -+CONFIG_DEVFS_FS=y -+CONFIG_DEVFS_MOUNT=y - # CONFIG_DEVFS_DEBUG is not set - # CONFIG_DEVPTS_FS is not set - # CONFIG_QNX4FS_FS is not set -diff -rduN ./arch/sparc/defconfig ./arch/sparc/defconfig ---- ./arch/sparc/defconfig 2004-04-14 15:05:27.000000000 +0200 -+++ ./arch/sparc/defconfig 2004-04-20 00:04:42.000000000 +0200 -@@ -329,8 +329,8 @@ - # CONFIG_NTFS_RW is not set - CONFIG_HPFS_FS=m - CONFIG_PROC_FS=y --# CONFIG_DEVFS_FS is not set --# CONFIG_DEVFS_MOUNT is not set -+CONFIG_DEVFS_FS=y -+CONFIG_DEVFS_MOUNT=y - # CONFIG_DEVFS_DEBUG is not set - CONFIG_DEVPTS_FS=y - # CONFIG_QNX4FS_FS is not set diff --git a/attic/linux24-psionw/12-conf-hacks.patch b/attic/linux24-psionw/12-conf-hacks.patch deleted file mode 100644 index e073676ad..000000000 --- a/attic/linux24-psionw/12-conf-hacks.patch +++ /dev/null @@ -1,126 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../linux24-psionw/12-conf-hacks.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# Copyright (C) 1998 - 2003 Clifford Wolf -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- ./scripts/Configure.orig 2003-01-13 23:24:50.000000000 +0100 -+++ ./scripts/Configure 2003-01-13 23:24:54.000000000 +0100 -@@ -49,6 +49,8 @@ - # 24 January 1999, Michael Elizabeth Chastain, - # - Improve the exit message (Jeff Ronne). - -+# 20-06-1999: Added ALL_MODS_HACK and NEVER_ASK_HACK - Clifford -+# 01-05-2001: Improved ALL_MODS_HACK - Rene - # - # Make sure we're really running bash. - # -@@ -184,6 +186,7 @@ - ;; - esac - while :; do -+ [ -z "$old" -a ".$NEVER_ASK_HACK" = .1 ] && old="$def" - readln "$1 ($2) [$defprompt] " "$def" "$old" - case "$ans" in - [yY] | [yY]es ) define_bool "$2" "y" -@@ -216,6 +219,10 @@ - ;; - esac - while :; do -+ if [ ".$ALL_MODS_HACK" = .1 -a ".$def" != .y ] ; then -+ old=m ; def=m -+ fi -+ [ -z "$old" -a ".$NEVER_ASK_HACK" = .1 ] && old="$def" - readln "$1 ($2) [$defprompt] " "$def" "$old" - case "$ans" in - [yY] | [yY]es ) define_tristate "$2" "y" -@@ -271,6 +278,10 @@ - ;; - esac - while :; do -+ if [ ".$ALL_MODS_HACK" = .1 ] ; then -+ old=m ; def=m -+ fi -+ [ -z "$old" -a ".$NEVER_ASK_HACK" = .1 ] && old="$def" - readln "$ques ($var) [$defprompt] " "$def" "$old" - case "$ans" in - [nN] | [nN]o ) define_tristate "$var" "n" -@@ -359,6 +370,8 @@ - max=10000000 # !! - fi - while :; do -+ [ -z "$def" -a ".$NEVER_ASK_HACK" = .1 ] && def="0" -+ [ -z "$old" -a ".$NEVER_ASK_HACK" = .1 ] && old="$def" - readln "$1 ($2) [$def] " "$def" "$old" - if expr \( \( $ans + 0 \) \>= $min \) \& \( $ans \<= $max \) >/dev/null 2>&1 ; then - define_int "$2" "$ans" -@@ -390,6 +403,8 @@ - def=${old:-$3} - def=${def#*[x,X]} - while :; do -+ [ -z "$def" -a ".$NEVER_ASK_HACK" = .1 ] && def="0" -+ [ -z "$old" -a ".$NEVER_ASK_HACK" = .1 ] && old="$def" - readln "$1 ($2) [$def] " "$def" "$old" - ans=${ans#*[x,X]} - if expr "$ans" : '[0-9a-fA-F][0-9a-fA-F]*$' > /dev/null; then -@@ -420,6 +435,8 @@ - function string () { - old=$(eval echo "\${$2}") - def=${old:-$3} -+ [ -z "$def" -a ".$NEVER_ASK_HACK" = .1 ] && def="-" -+ [ -z "$old" -a ".$NEVER_ASK_HACK" = .1 ] && old="$def" - while :; do - if [ "$old" = "?" ]; then - readln "$1 ($2) [$def] " "$def" "" -@@ -474,6 +491,7 @@ - val="" - while [ -z "$val" ]; do - ambg=n -+ [ -z "$old" -a ".$NEVER_ASK_HACK" = .1 ] && old="$def" - readln "$question ($names) [$def] " "$def" "$old" - ans=$(echo $ans | tr a-z A-Z) - set -- $choices -@@ -534,11 +552,19 @@ - echo "#define AUTOCONF_INCLUDED" >> $CONFIG_H - - DEFAULT="" --if [ "$1" = "-d" ] ; then -+ALL_MODS_HACK="0" -+NEVER_ASK_HACK="0" -+ -+if [ "$1" = "-d" -o "$1" = "-D" -o "$1" = "-m" -o "$1" = "-M" ] ; then -+ [ "$1" = "-D" -o "$1" = "-M" ] && NEVER_ASK_HACK="1" -+ [ "$1" = "-m" -o "$1" = "-M" ] && ALL_MODS_HACK="1" - DEFAULT="-d" - shift - fi - -+[ $NEVER_ASK_HACK = 1 ] && echo "Debug: NEVER_ASK_HACK active." -+[ $ALL_MODS_HACK = 1 ] && echo "Debug: ALL_MODS_HACK active." -+ - CONFIG_IN=./config.in - if [ "$1" != "" ] ; then - CONFIG_IN=$1 ---- ./Makefile.orig 2003-01-13 23:24:57.000000000 +0100 -+++ ./Makefile 2003-01-13 23:25:56.000000000 +0100 -@@ -301,6 +301,9 @@ - oldconfig: symlinks - $(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in - -+no2modconfig: symlinks -+ $(CONFIG_SHELL) scripts/Configure -m arch/$(ARCH)/config.in -+ - xconfig: symlinks - $(MAKE) -C scripts kconfig.tk - wish -f scripts/kconfig.tk diff --git a/attic/linux24-psionw/20-kernel-cc.patch b/attic/linux24-psionw/20-kernel-cc.patch deleted file mode 100644 index 08cddc685..000000000 --- a/attic/linux24-psionw/20-kernel-cc.patch +++ /dev/null @@ -1,35 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../linux24-psionw/20-kernel-cc.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# Copyright (C) 1998 - 2003 Clifford Wolf -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - - -This Patch is specific to ROCK Linux and not available as stand-alone patch. - - - Clifford Wolf - ---- linux/Makefile -+++ linux/Makefile -@@ -27,7 +27,9 @@ - - AS = $(CROSS_COMPILE)as - LD = $(CROSS_COMPILE)ld --CC = $(CROSS_COMPILE)gcc -+KCC = $(CROSS_COMPILE)kcc -+GCC = $(CROSS_COMPILE)gcc -+CC = $(if $(shell sh -c 'type -p $(KCC)'),$(KCC),$(GCC)) - CPP = $(CC) -E - AR = $(CROSS_COMPILE)ar - NM = $(CROSS_COMPILE)nm diff --git a/attic/linux24-psionw/99-mkdep-arglist-too-long.patch b/attic/linux24-psionw/99-mkdep-arglist-too-long.patch deleted file mode 100644 index d044f4d87..000000000 --- a/attic/linux24-psionw/99-mkdep-arglist-too-long.patch +++ /dev/null @@ -1,36 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../linux24-psionw/99-mkdep-arglist-too-long.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# Copyright (C) 1998 - 2003 Clifford Wolf -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -Depending on the working directory where the kernel is build, the file -list can grow to produce an "argument to long" error on mkdep line. -This patch only slits the process to have shorter lines. - - - Alejandro - ---- ./Makefile.orig 2003-09-23 22:19:55.000000000 -0400 -+++ ./Makefile 2003-09-23 22:28:29.000000000 -0400 -@@ -518,7 +518,9 @@ - ifdef CONFIG_MODVERSIONS - $(MAKE) update-modverfile - endif -- scripts/mkdep -- `find $(FINDHPATH) \( -name SCCS -o -name .svn \) -prune -o -follow -name \*.h ! -name modversions.h -print` > .hdepend -+ for x in $(FINDHPATH); do \ -+ scripts/mkdep -- `find $$x \( -name SCCS -o -name .svn \) -prune -o -follow -name \*.h ! -name modversions.h -print` >> .hdepend ; \ -+ done - scripts/mkdep -- init/*.c > .depend - - ifdef CONFIG_MODVERSIONS diff --git a/attic/linux24-psionw/gcc-3.4-upstream.patch b/attic/linux24-psionw/gcc-3.4-upstream.patch deleted file mode 100644 index f5b50e037..000000000 --- a/attic/linux24-psionw/gcc-3.4-upstream.patch +++ /dev/null @@ -1,44 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../linux24-psionw/gcc-3.4-upstream.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- ---- linux-2.4.27/drivers/char/keyboard.c.vanilla 2005-02-01 23:05:43.391427456 +0100 -+++ linux-2.4.27/drivers/char/keyboard.c 2005-02-01 23:06:31.297144680 +0100 -@@ -419,6 +419,7 @@ - } - rep = 0; - out: -+ ; - } - - /* ---- linux-2.4.27/include/asm-arm/hardware/psionw.h.vanilla 2005-02-01 23:04:22.173774416 +0100 -+++ linux-2.4.27/include/asm-arm/hardware/psionw.h 2005-02-01 23:04:28.740776080 +0100 -@@ -399,4 +399,4 @@ - #define COEOI (0x0a0c) /* Codec end of interrupt, write only */ - #define COTEST (0x0a10) /* Codec test register */ - --#endif /* __ASM_HARDWARE_PSIONW_H */ \ -+#endif /* __ASM_HARDWARE_PSIONW_H */ ---- linux-2.4.27/drivers/char/keyboard_psion.c.vanilla 2005-02-01 23:14:21.000000000 +0100 -+++ linux-2.4.27/drivers/char/keyboard_psion.c 2005-02-01 23:14:43.000000000 +0100 -@@ -54,6 +54,8 @@ - "\000" "\000" "\000" "," "\000" " " "\000"; - #endif - -+void debug_gpio(void); -+ - void psion_cleartable(void) - { - int key; diff --git a/attic/linux24-psionw/gcc-3.4.patch b/attic/linux24-psionw/gcc-3.4.patch deleted file mode 100644 index 552d38280..000000000 --- a/attic/linux24-psionw/gcc-3.4.patch +++ /dev/null @@ -1,105 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../linux24-psionw/gcc-3.4.patch -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- ---- linux-2.4.27/arch/arm/Makefile.vanilla 2005-02-01 21:54:13.127646688 +0100 -+++ linux-2.4.27/arch/arm/Makefile 2005-02-01 21:54:23.551062088 +0100 -@@ -50,8 +50,8 @@ - tune-$(CONFIG_CPU_SA110) :=-mtune=strongarm110 - tune-$(CONFIG_CPU_SA1100) :=-mtune=strongarm1100 - --CFLAGS_BOOT :=$(apcs-y) $(arch-y) $(tune-y) -mshort-load-bytes -msoft-float -Uarm --CFLAGS +=$(apcs-y) $(arch-y) $(tune-y) -mshort-load-bytes -msoft-float -Uarm -+CFLAGS_BOOT :=$(apcs-y) $(arch-y) $(tune-y) -msoft-float -Uarm -+CFLAGS +=$(apcs-y) $(arch-y) $(tune-y) -msoft-float -Uarm - AFLAGS +=$(apcs-y) $(arch-y) -msoft-float - - ifeq ($(CONFIG_CPU_26),y) ---- linux-2.4.27/include/linux/sched.h.vanilla 2005-02-01 22:51:23.418163264 +0100 -+++ linux-2.4.27/include/linux/sched.h 2005-02-01 22:51:37.002098192 +0100 -@@ -763,7 +763,7 @@ - extern void end_lazy_tlb(struct mm_struct *mm); - - /* mmdrop drops the mm and the page tables */ --extern inline void FASTCALL(__mmdrop(struct mm_struct *)); -+extern void FASTCALL(__mmdrop(struct mm_struct *)); - static inline void mmdrop(struct mm_struct * mm) - { - if (atomic_dec_and_test(&mm->mm_count)) ---- linux-2.4.27/include/linux/blkdev.h.vanilla 2005-02-01 22:59:51.021995752 +0100 -+++ linux-2.4.27/include/linux/blkdev.h 2005-02-01 22:59:57.948942696 +0100 -@@ -233,7 +233,7 @@ - extern void grok_partitions(struct gendisk *dev, int drive, unsigned minors, long size); - extern void register_disk(struct gendisk *dev, kdev_t first, unsigned minors, struct block_device_operations *ops, long size); - extern void generic_make_request(int rw, struct buffer_head * bh); --extern inline request_queue_t *blk_get_queue(kdev_t dev); -+extern request_queue_t *blk_get_queue(kdev_t dev); - extern void blkdev_release_request(struct request *); - - /* ---- linux-2.4.27/include/net/irda/irlmp_frame.h.vanilla 2005-02-01 23:24:49.294223752 +0100 -+++ linux-2.4.27/include/net/irda/irlmp_frame.h 2005-02-01 23:24:55.000000000 +0100 -@@ -40,7 +40,7 @@ - - #define CONTROL_BIT 0x80 - --inline void irlmp_send_data_pdu(struct lap_cb *self, __u8 dlsap, __u8 slsap, -+void irlmp_send_data_pdu(struct lap_cb *self, __u8 dlsap, __u8 slsap, - int expedited, struct sk_buff *skb); - void irlmp_send_lcf_pdu(struct lap_cb *self, __u8 dlsap, __u8 slsap, - __u8 opcode, struct sk_buff *skb); ---- linux-2.4.27/include/net/irda/timer.h.vanilla 2005-02-01 23:23:56.300280056 +0100 -+++ linux-2.4.27/include/net/irda/timer.h 2005-02-01 23:55:16.238486008 +0100 -@@ -72,21 +72,21 @@ - void irda_start_timer(struct timer_list *ptimer, int timeout, void* data, - TIMER_CALLBACK callback); - --inline void irlap_start_slot_timer(struct irlap_cb *self, int timeout); --inline void irlap_start_query_timer(struct irlap_cb *self, int timeout); --inline void irlap_start_final_timer(struct irlap_cb *self, int timeout); --inline void irlap_start_wd_timer(struct irlap_cb *self, int timeout); --inline void irlap_start_backoff_timer(struct irlap_cb *self, int timeout); -+void irlap_start_slot_timer(struct irlap_cb *self, int timeout); -+void irlap_start_query_timer(struct irlap_cb *self, int timeout); -+void irlap_start_final_timer(struct irlap_cb *self, int timeout); -+void irlap_start_wd_timer(struct irlap_cb *self, int timeout); -+void irlap_start_backoff_timer(struct irlap_cb *self, int timeout); - - void irlap_start_mbusy_timer(struct irlap_cb *self, int timeout); - void irlap_stop_mbusy_timer(struct irlap_cb *); - - struct lsap_cb; - struct lap_cb; --inline void irlmp_start_watchdog_timer(struct lsap_cb *, int timeout); --inline void irlmp_start_discovery_timer(struct irlmp_cb *, int timeout); --inline void irlmp_start_idle_timer(struct lap_cb *, int timeout); --inline void irlmp_stop_idle_timer(struct lap_cb *self); -+void irlmp_start_watchdog_timer(struct lsap_cb *, int timeout); -+void irlmp_start_discovery_timer(struct irlmp_cb *, int timeout); -+void irlmp_start_idle_timer(struct lap_cb *, int timeout); -+void irlmp_stop_idle_timer(struct lap_cb *self); - - #endif - ---- linux-2.4.27/include/net/ip.h.vanilla 2005-02-01 23:17:32.000000000 +0100 -+++ linux-2.4.27/include/net/ip.h 2005-02-01 23:55:18.968071048 +0100 -@@ -137,7 +137,7 @@ - void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *arg, - unsigned int len); - --extern __inline__ int ip_finish_output(struct sk_buff *skb); -+extern int ip_finish_output(struct sk_buff *skb); - - struct ipv4_config - { diff --git a/attic/linux24-psionw/gcc-4x.patch b/attic/linux24-psionw/gcc-4x.patch deleted file mode 100644 index f20865cda..000000000 --- a/attic/linux24-psionw/gcc-4x.patch +++ /dev/null @@ -1,337 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../linux24-psionw/gcc-4x.patch -# Copyright (C) 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - ---- linux24-psionw/fs/proc/proc_misc.c.vanilla 2006-04-11 19:56:36.000000000 +0200 -+++ linux24-psionw/fs/proc/proc_misc.c 2006-04-11 19:56:43.000000000 +0200 -@@ -562,7 +562,7 @@ - /* - * writing 'C' to /proc/sysrq-trigger is like sysrq-C - */ --static ssize_t write_sysrq_trigger(struct file *file, const char *buf, -+static ssize_t write_sysrq_trigger(struct file *file, char *buf, - size_t count, loff_t *ppos) - { - if (count) { ---- linux24-psionw/fs/readdir.c.vanilla 2006-04-11 20:06:42.000000000 +0200 -+++ linux24-psionw/fs/readdir.c 2006-04-11 20:13:32.000000000 +0200 -@@ -264,7 +264,7 @@ - put_user(reclen, &dirent->d_reclen); - copy_to_user(dirent->d_name, name, namlen); - put_user(0, dirent->d_name + namlen); -- ((char *) dirent) += reclen; -+ dirent = (char*) dirent + reclen; - buf->current_dir = dirent; - buf->count -= reclen; - return 0; -@@ -347,7 +347,7 @@ - copy_to_user(dirent, &d, NAME_OFFSET(&d)); - copy_to_user(dirent->d_name, name, namlen); - put_user(0, dirent->d_name + namlen); -- ((char *) dirent) += reclen; -+ dirent = (char*) dirent + reclen; - buf->current_dir = dirent; - buf->count -= reclen; - return 0; ---- linux24-psionw/net/irda/irlan/irlan_event.c.vanilla 2006-04-11 20:20:28.000000000 +0200 -+++ linux24-psionw/net/irda/irlan/irlan_event.c 2006-04-11 20:20:35.000000000 +0200 -@@ -24,7 +24,7 @@ - - #include - --char *irlan_state[] = { -+static char *irlan_state[] = { - "IRLAN_IDLE", - "IRLAN_QUERY", - "IRLAN_CONN", ---- linux24-psionw/arch/arm/lib/longlong.h.vanilla 2006-04-11 21:01:31.000000000 +0200 -+++ linux24-psionw/arch/arm/lib/longlong.h 2006-04-11 21:01:38.000000000 +0200 -@@ -161,7 +161,7 @@ - #define UDIV_NEEDS_NORMALIZATION 1 - #define udiv_qrnnd __udiv_qrnnd_c - --extern const UQItype __clz_tab[]; -+static const UQItype __clz_tab[]; - #define count_leading_zeros(count, x) \ - do { \ - USItype __xr = (x); \ ---- linux24-psionw/arch/arm/nwfpe/fpa11_cpdt.c.vanilla 2006-04-11 21:02:16.000000000 +0200 -+++ linux24-psionw/arch/arm/nwfpe/fpa11_cpdt.c 2006-04-11 21:03:33.000000000 +0200 -@@ -28,14 +28,14 @@ - - #include - --static inline void loadSingle(const unsigned int Fn, const unsigned int *pMem) -+static inline void loadSingle(unsigned int Fn, unsigned int *pMem) - { - FPA11 *fpa11 = GET_FPA11(); - fpa11->fType[Fn] = typeSingle; - get_user(fpa11->fpreg[Fn].fSingle, pMem); - } - --static inline void loadDouble(const unsigned int Fn, const unsigned int *pMem) -+static inline void loadDouble(const unsigned int Fn, unsigned int *pMem) - { - FPA11 *fpa11 = GET_FPA11(); - unsigned int *p; -@@ -46,7 +46,7 @@ - } - - #ifdef CONFIG_FPE_NWFPE_XP --static inline void loadExtended(const unsigned int Fn, const unsigned int *pMem) -+static inline void loadExtended(const unsigned int Fn, unsigned int *pMem) - { - FPA11 *fpa11 = GET_FPA11(); - unsigned int *p; -@@ -58,7 +58,7 @@ - } - #endif - --static inline void loadMultiple(const unsigned int Fn, const unsigned int *pMem) -+static inline void loadMultiple(unsigned int Fn, unsigned int *pMem) - { - FPA11 *fpa11 = GET_FPA11(); - register unsigned int *p; ---- linux24-psionw/arch/arm/kernel/io.c.vanilla 2006-04-11 20:58:56.000000000 +0200 -+++ linux24-psionw/arch/arm/kernel/io.c 2006-04-11 21:00:10.000000000 +0200 -@@ -12,7 +12,7 @@ - while (count) { - count--; - *(char *) to = readb(from); -- ((char *) to)++; -+ to = (char *) to + 1; - from++; - } - } -@@ -26,7 +26,7 @@ - while (count) { - count--; - writeb(*(char *) from, to); -- ((char *) from)++; -+ from = (char *) from + 1; - to++; - } - } ---- linux24-psionw/init/do_mounts.c.vanilla 2006-04-11 18:05:05.000000000 +0200 -+++ linux24-psionw/init/do_mounts.c 2006-04-11 18:05:30.000000000 +0200 -@@ -52,7 +52,7 @@ - int __initdata rd_doload; /* 1 = load RAM disk, 0 = don't load */ - - int root_mountflags = MS_RDONLY | MS_VERBOSE; --static char root_device_name[64]; -+char root_device_name[64]; - - /* this is initialized in init/main.c */ - kdev_t ROOT_DEV; ---- linux24-psionw/drivers/char/vc_screen.c.vanilla 2006-04-11 19:51:32.000000000 +0200 -+++ linux24-psionw/drivers/char/vc_screen.c 2006-04-11 19:51:54.000000000 +0200 -@@ -421,7 +421,7 @@ - while (this_round > 1) { - unsigned short w; - -- w = get_unaligned(((const unsigned short *)con_buf0)); -+ w = get_unaligned(((unsigned short *)con_buf0)); - vcs_scr_writew(currcons, w, org++); - con_buf0 += 2; - this_round -= 2; ---- linux24-psionw/drivers/char/n_tty.c.vanilla 2006-04-11 19:50:37.000000000 +0200 -+++ linux24-psionw/drivers/char/n_tty.c 2006-04-11 19:51:07.000000000 +0200 -@@ -1147,9 +1147,9 @@ - } - - static ssize_t write_chan(struct tty_struct * tty, struct file * file, -- const unsigned char * buf, size_t nr) -+ unsigned char * buf, size_t nr) - { -- const unsigned char *b = buf; -+ unsigned char *b = buf; - DECLARE_WAITQUEUE(wait, current); - int c; - ssize_t retval = 0; ---- linux24-psionw/drivers/sound/sound_firmware.c.vanilla 2006-04-11 19:52:28.000000000 +0200 -+++ linux24-psionw/drivers/sound/sound_firmware.c 2006-04-11 19:52:56.000000000 +0200 -@@ -7,7 +7,7 @@ - #include - #include - --static int errno; -+//int errno; - static int do_mod_firmware_load(const char *fn, char **fp) - { - int fd; ---- linux24-psionw/drivers/video/fbcon.c.vanilla 2006-04-11 19:53:32.000000000 +0200 -+++ linux24-psionw/drivers/video/fbcon.c 2006-04-11 19:55:44.000000000 +0200 -@@ -1877,7 +1877,7 @@ - font length must be multiple of 256, at least. And 256 is multiple - of 4 */ - k = 0; -- while (p > new_data) k += *--(u32 *)p; -+ for (; p > new_data; p-=4) k += *p; - FNTSUM(new_data) = k; - /* Check if the same font is on some other console already */ - for (i = 0; i < MAX_NR_CONSOLES; i++) { ---- linux24-psionw/kernel/sysctl.c.vanilla 2006-04-11 19:38:32.000000000 +0200 -+++ linux24-psionw/kernel/sysctl.c 2006-04-11 19:50:06.000000000 +0200 -@@ -879,7 +879,7 @@ - if (!isspace(c)) - break; - left--; -- ((char *) buffer)++; -+ buffer++; - } - if (!left) - break; -@@ -1032,7 +1032,7 @@ - if (!isspace(c)) - break; - left--; -- ((char *) buffer)++; -+ buffer++; - } - if (!left) - break; -@@ -1133,7 +1133,7 @@ - if (!isspace(c)) - break; - left--; -- ((char *) buffer)++; -+ buffer++; - } - if (!left) - break; ---- linux24-psionw/include/net/irda/irttp.h.vanilla 2006-04-11 20:56:55.000000000 +0200 -+++ linux24-psionw/include/net/irda/irttp.h 2006-04-11 20:57:05.000000000 +0200 -@@ -209,6 +209,6 @@ - return(irlap_is_primary(self->lsap->lap->irlap)); - } - --extern struct irttp_cb *irttp; -+static struct irttp_cb *irttp; - - #endif /* IRTTP_H */ ---- linux24-psionw/include/net/irda/irlan_event.h.vanilla 2006-04-11 20:19:39.000000000 +0200 -+++ linux24-psionw/include/net/irda/irlan_event.h 2006-04-11 20:57:23.000000000 +0200 -@@ -67,7 +67,7 @@ - IRLAN_WATCHDOG_TIMEOUT, - } IRLAN_EVENT; - --extern char *irlan_state[]; -+static char *irlan_state[]; - - void irlan_do_client_event(struct irlan_cb *self, IRLAN_EVENT event, - struct sk_buff *skb); ---- linux24-psionw/include/net/ipv6.h.vanilla 2006-04-11 20:15:01.000000000 +0200 -+++ linux24-psionw/include/net/ipv6.h 2006-04-11 20:15:34.000000000 +0200 -@@ -20,6 +20,8 @@ - #include - #include - -+#include -+ - #define SIN6_LEN_RFC2133 24 - - /* ---- linux24-psionw/include/net/icmp.h.vanilla 2006-04-11 20:16:38.000000000 +0200 -+++ linux24-psionw/include/net/icmp.h 2006-04-11 20:17:49.000000000 +0200 -@@ -24,6 +24,8 @@ - #include - #include - -+#include -+ - struct icmp_err { - int errno; - unsigned fatal:1; ---- linux24-psionw/include/linux/irq_cpustat.h.vanilla 2006-04-11 19:37:23.000000000 +0200 -+++ linux24-psionw/include/linux/irq_cpustat.h 2006-04-11 19:37:27.000000000 +0200 -@@ -22,7 +22,7 @@ - #ifdef CONFIG_SMP - #define __IRQ_STAT(cpu, member) (irq_stat[cpu].member) - #else --#define __IRQ_STAT(cpu, member) ((void)(cpu), irq_stat[0].member) -+#define __IRQ_STAT(cpu, member) (irq_stat[((void)(cpu), 0)].member) - #endif - - /* arch independent irq_stat fields */ ---- linux24-psionw/include/asm-arm/setup.h.vanilla 2006-04-11 21:06:30.000000000 +0200 -+++ linux24-psionw/include/asm-arm/setup.h 2006-04-11 21:07:16.000000000 +0200 -@@ -265,6 +265,6 @@ - } bank[NR_BANKS]; - }; - --extern struct meminfo meminfo; -+// extern struct meminfo meminfo; - - #endif ---- linux24-psionw/arch/arm/Makefile.vanilla 2006-04-11 23:07:45.000000000 +0200 -+++ linux24-psionw/arch/arm/Makefile 2006-04-11 23:07:50.000000000 +0200 -@@ -27,7 +27,7 @@ - # - # Note! For APCS-26 YOU MUST HAVE AN APCS-26 LIBGCC.A - # --apcs-y :=-mapcs-32 -+apcs-y := - apcs-$(CONFIG_CPU_26) :=-mapcs-26 -mcpu=arm3 -Os - - # This selects which instruction set is used. ---- linux24-psionw/lib/crc32.c.vanilla 2006-07-29 20:12:35.000000000 +0200 -+++ linux24-psionw/lib/crc32.c 2006-07-29 20:13:40.000000000 +0200 -@@ -99,7 +99,7 @@ - /* Align it */ - if(unlikely(((long)b)&3 && len)){ - do { -- DO_CRC(*((u8 *)b)++); -+ DO_CRC(*(b)++); - } while ((--len) && ((long)b)&3 ); - } - if(likely(len >= 4)){ -@@ -120,7 +120,7 @@ - /* And the last few bytes */ - if(len){ - do { -- DO_CRC(*((u8 *)b)++); -+ DO_CRC(*(b)++); - } while (--len); - } - -@@ -200,7 +200,7 @@ - /* Align it */ - if(unlikely(((long)b)&3 && len)){ - do { -- DO_CRC(*((u8 *)b)++); -+ DO_CRC(*(b)++); - } while ((--len) && ((long)b)&3 ); - } - if(likely(len >= 4)){ -@@ -221,7 +221,7 @@ - /* And the last few bytes */ - if(len){ - do { -- DO_CRC(*((u8 *)b)++); -+ DO_CRC(*(b)++); - } while (--len); - } - return __be32_to_cpu(crc); ---- linux24-psionw/drivers/pcmcia/bulkmem.c.vanilla 2006-07-29 20:09:16.000000000 +0200 -+++ linux24-psionw/drivers/pcmcia/bulkmem.c 2006-07-29 20:10:40.000000000 +0200 -@@ -301,7 +301,7 @@ - { - window_handle_t w; - int ret = pcmcia_request_window(a1, a2, &w); -- (window_handle_t *)a1 = w; -+ a1 = w; - return ret; - } - break; diff --git a/attic/linux24-psionw/linux24-psionw.conf b/attic/linux24-psionw/linux24-psionw.conf deleted file mode 100644 index b351cb699..000000000 --- a/attic/linux24-psionw/linux24-psionw.conf +++ /dev/null @@ -1,24 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../linux24-psionw/linux24-psionw.conf -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. A copy of the -# GNU General Public License can be found in the file COPYING. -# --- SDE-COPYRIGHT-NOTE-END --- - -# simply do the same as the linux24 package - -lx_grabextraversion() { - lx_kernelrelease="$ver" -} - -lx_injectextraversion() { - true -} - diff --git a/attic/linux24-psionw/linux24-psionw.desc b/attic/linux24-psionw/linux24-psionw.desc deleted file mode 100644 index b42f7299b..000000000 --- a/attic/linux24-psionw/linux24-psionw.desc +++ /dev/null @@ -1,44 +0,0 @@ -[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- -[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. -[COPY] -[COPY] Filename: package/.../linux24-psionw/linux24-psionw.desc -[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project -[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project -[COPY] -[COPY] More information can be found in the files COPYING and README. -[COPY] -[COPY] This program is free software; you can redistribute it and/or modify -[COPY] it under the terms of the GNU General Public License as published by -[COPY] the Free Software Foundation; version 2 of the License. A copy of the -[COPY] GNU General Public License can be found in the file COPYING. -[COPY] --- SDE-COPYRIGHT-NOTE-END --- - -[I] A specially patched Linux kernel for Psion Windermere ARM PDAs - -[T] This package contains a precompiled kernel image and the modules. - -[U] http://www.kernel.org/ - -[A] Linus Torvalds -[A] Tony Lindgren -[M] The OpenSDE Community - -[C] base/kernel -[F] KERNEL - -[E] group kernel-bin - -[R] + arm - -[L] GPL -[S] Stable -[V] 2.4.27-vrs1-5mx2-ska-2 -[P] O -1---5---9 102.060 - -[O] . $base/package/*/linux/linux.conf - -#[D] 3224398821 linux-2.4.27.tar.bz2 http://ftp.kernel.org/pub/linux/kernel/v2.4/ -#[D] 134254896 patch-2.4.27-vrs1.bz2 http://ftp.linux.org.uk/pub/linux/arm/kernel/v2.4/ -#[D] 1131692212 patch-2.4.27-vrs1-5mx2_ska_2.patch.txt !http://www.ipd.bth.se/ska/sim_home/patch-2.4.27-vrs1-5mx2_ska.patch.txt -[D] X linux-2.4.27-psionw-r11.tar.bz2 svn+http://svn.exactcode.de/linux24-psionw/trunk/ linux24-psionw -r11 - diff --git a/attic/linux24-psionw/pro16.patch b/attic/linux24-psionw/pro16.patch deleted file mode 100644 index 9a84f2728..000000000 --- a/attic/linux24-psionw/pro16.patch +++ /dev/null @@ -1,72 +0,0 @@ -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: package/.../linux24-psionw/pro16.patch -# Copyright (C) 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- SDE-COPYRIGHT-NOTE-END --- - -diff -ur linux24-psionw/arch/arm/config.in linux24-psionw-16pro/arch/arm/config.in ---- linux24-psionw/arch/arm/config.in 2000-01-01 00:00:00.000000000 +0100 -+++ linux24-psionw-16pro/arch/arm/config.in 2006-07-29 22:47:18.000000000 +0200 -@@ -188,6 +188,7 @@ - comment 'Psion Windermere Implementations' - choice 'Psion-Windermere Implementations' \ - "Psion-5MX-16MB-and-Ericsson-MC218 CONFIG_PSIONW_5MX \ -+ Psion-5MX-Pro-16MB CONFIG_PSIONW_5MXPRO16MB \ - Psion-5MX-Pro-24MB CONFIG_PSIONW_5MXPRO24MB \ - Psion-5MX-Pro-32MB CONFIG_PSIONW_5MXPRO32MB \ - Psion-Revo-8MB CONFIG_PSIONW_REVO \ -diff -ur linux24-psionw/arch/arm/mach-psionw/psionw-arch.c linux24-psionw-16pro/arch/arm/mach-psionw/psionw-arch.c ---- linux24-psionw/arch/arm/mach-psionw/psionw-arch.c 2000-01-01 00:00:00.000000000 +0100 -+++ linux24-psionw-16pro/arch/arm/mach-psionw/psionw-arch.c 2006-07-29 22:49:02.000000000 +0200 -@@ -48,7 +48,7 @@ - char **cmdline, struct meminfo *mi) - { - --#ifdef CONFIG_PSIONW_5MX -+#if defined(CONFIG_PSIONW_5MX) || defined(CONFIG_PSIONW_5MXPRO16MB) - SET_BANK(0, 0xc0000000, 8 * 1024 * 1024); - SET_BANK(1, 0xc1000000, 8 * 1024 * 1024); - mi->nr_banks = 2; -diff -ur linux24-psionw/drivers/pcmcia/psion_etna.h linux24-psionw-16pro/drivers/pcmcia/psion_etna.h ---- linux24-psionw/drivers/pcmcia/psion_etna.h 2000-01-01 00:00:00.000000000 +0100 -+++ linux24-psionw-16pro/drivers/pcmcia/psion_etna.h 2006-07-29 22:46:38.000000000 +0200 -@@ -72,7 +72,7 @@ - - save_flags_cli(flags); - --#if defined(CONFIG_PSIONW_5MXPRO24MB) | defined(CONFIG_PSIONW_5MXPRO32MB) -+#if defined(CONFIG_PSIONW_5MXPRO16MB) || defined(CONFIG_PSIONW_5MXPRO24MB) || defined(CONFIG_PSIONW_5MXPRO32MB) - /* Set the memory wait states to PCMCIA */ - // FIXME5MX: Should be checked... - psionw_writel(0x93930002, MEMCFG1); -diff -ur linux24-psionw/include/asm-arm/hardware/psionw.h linux24-psionw-16pro/include/asm-arm/hardware/psionw.h ---- linux24-psionw/include/asm-arm/hardware/psionw.h 2000-01-01 00:00:00.000000000 +0100 -+++ linux24-psionw-16pro/include/asm-arm/hardware/psionw.h 2006-07-29 22:46:04.000000000 +0200 -@@ -111,7 +111,7 @@ - /* - * ETNA PCMCIA Controller - */ --#if defined(CONFIG_PSIONW_5MXPRO24MB) || defined(CONFIG_PSIONW_5MXPRO32MB) -+#if defined(CONFIG_PSIONW_5MXPRO16MB) || defined(CONFIG_PSIONW_5MXPRO24MB) || defined(CONFIG_PSIONW_5MXPRO32MB) - #define ETNA_P_BASE 0x50000000 /* ETNA controller physical base */ - #else - #define ETNA_P_BASE 0x20000000 /* ETNA controller physical base */ -@@ -150,7 +150,7 @@ - #define ETNA_CLEAR_MASK 0xff /* Clear ETNA interrupt */ - #define ETNA_CF_IRQ 0x01 /* Enable ETNA Interrupt */ - --#if defined(CONFIG_PSIONW_5MXPRO24MB) || defined(CONFIG_PSIONW_5MXPRO32MB) -+#if defined(CONFIG_PSIONW_5MXPRO16MB) || defined(CONFIG_PSIONW_5MXPRO24MB) || defined(CONFIG_PSIONW_5MXPRO32MB) - #define CF1_P_BASE 0x30000000 /* PCMCIA physical base */ - #else - #define CF1_P_BASE 0x40000000 /* PCMCIA physical base */