diff options
author | Chris Larson <clarson@kergoth.com> | 2004-11-24 01:09:22 +0000 |
---|---|---|
committer | Chris Larson <clarson@kergoth.com> | 2004-11-24 01:09:22 +0000 |
commit | fdd7f29cf1afcc72f759e4685fc8753fd6efe6a8 (patch) | |
tree | b085b3af1cf30dc88c2817b614c1ceb29c2d9d84 /linux | |
parent | d8f8500b4446cd35ebcbe66ead454bd5f0b01941 (diff) |
Unbork patch application in openzaurus-pxa resulting from the merge of rob's tosa fixes.
BKrev: 41a3df42EZfYz-1TnlEfjY_-zFDuTA
Diffstat (limited to 'linux')
-rw-r--r-- | linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/tosa-power-key-off.patch | 4 | ||||
-rw-r--r-- | linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/tosa-power-key-off.patch b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/tosa-power-key-off.patch index 94fdbe4ded..380e6be813 100644 --- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/tosa-power-key-off.patch +++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/tosa-power-key-off.patch @@ -5,7 +5,7 @@ --- linux/drivers/char/tosa_ts.c~tosa-power-key-off +++ linux/drivers/char/tosa_ts.c -@@ -203,10 +203,53 @@ +@@ -205,10 +205,53 @@ write: tosa_ts_write_params, }; @@ -59,7 +59,7 @@ proc_ts = proc_mkdir("driver/ts", NULL); if (proc_ts == NULL) { -@@ -232,6 +275,12 @@ +@@ -234,6 +277,12 @@ } } 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 5c746259bf..0ef6d85623 100644 --- a/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe +++ b/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe @@ -38,7 +38,6 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ file://disable-pcmcia-probe.patch;patch=1 \ file://deviceinfo.patch;patch=1 \ file://linux-2.4.18-list_move.patch;patch=1 \ - file://deviceinfo.patch;patch=1 \ file://tosa_map.patch;patch=1 \ file://tosa_ts.patch;patch=1 \ file://corgi-fbcon-logo.patch;patch=1 \ |