summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/enable-sysrq.patch20
-rw-r--r--linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe6
2 files changed, 21 insertions, 5 deletions
diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/enable-sysrq.patch b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/enable-sysrq.patch
index ece8fd9a5d..b1ea85018b 100644
--- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/enable-sysrq.patch
+++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/enable-sysrq.patch
@@ -1,5 +1,10 @@
---- linux/drivers/char/corgi_keyb.c~enable-sysrq 2003-09-05 01:18:15.000000000 +0200
-+++ linux/drivers/char/corgi_keyb.c 2003-09-05 01:40:17.000000000 +0200
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- linux/drivers/char/corgi_keyb.c~enable-sysrq
++++ linux/drivers/char/corgi_keyb.c
@@ -23,7 +23,7 @@
#include <linux/init.h>
#include <linux/poll.h>
@@ -43,3 +48,14 @@
}
int corgi_kbd_translate(unsigned char scancode, unsigned char *keycode_p)
+--- linux/drivers/char/keyboard.c~enable-sysrq
++++ linux/drivers/char/keyboard.c
+@@ -366,7 +366,7 @@
+ #ifdef CONFIG_MAGIC_SYSRQ /* Handle the SysRq Hack */
+ if (keycode == SYSRQ_KEY) {
+ sysrq_pressed = !up_flag;
+- goto out;
++ // goto out;
+ } else if (sysrq_pressed) {
+ if (!up_flag) {
+ handle_sysrq(kbd_sysrq_xlate[keycode], kbd_pt_regs, kbd, tty);
diff --git a/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe b/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe
index 8112b439f8..dda801ad9e 100644
--- a/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe
+++ b/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe
@@ -5,7 +5,7 @@ KV = "2.4.18"
RMKV = "7"
PXAV = "3"
SHARPV = "20031107"
-PR = "r24"
+PR = "r25"
DESCRIPTION = "Linux kernel for OpenZaurus PXA processor based devices."
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/openzaurus-pxa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}"
@@ -27,7 +27,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
file://sharpsl_battery.patch;patch=1 \
file://irda-qos.patch;patch=1 \
file://buffered-fbmem.patch;patch=1 \
- ${@get_sysreq_setting(oe, d)} \
+ file://enable-sysrq.patch;patch=1 \
file://compile.patch;patch=1 \
file://idecs.patch;patch=1 \
file://logo.patch;patch=1 \
@@ -46,7 +46,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
file://module_licence.patch;patch=1 \
http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/iw249_we16-6.diff;patch=1 \
file://defconfig-${MACHINE} \
- http://us1.samba.org/samba/ftp/cifs-cvs/cifs-1.20c-2.4.tar.gz "
+ http://us1.samba.org/samba/ftp/cifs-cvs/cifs-1.20c-2.4.tar.gz "
def get_sysreq_setting(oe, d):
if oe.data.getVar('ENABLE_SYSREQ', d, 1) in [ 'yes' ]: