summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorBart vdr. Meulen <bartvdrmeulen@gmail.com>2010-05-07 23:34:56 +0200
committerRemy Bohmer <linux@bohmer.net>2010-06-02 21:09:29 +0200
commit44e6ece9f2856a591c53f2f08f69aaca47e6b6e3 (patch)
tree23eae9a344e9c4b5189578faf55e7548786ff9d0 /patches
parentaf3c619059b204e20fd51634b2bbd8089c745451 (diff)
downloadptxdist-44e6ece9f2856a591c53f2f08f69aaca47e6b6e3.tar.gz
ptxdist-44e6ece9f2856a591c53f2f08f69aaca47e6b6e3.tar.xz
[setserial] tiocghayesesp build-fix
Signed-off-by: Bart vdr. Meulen <bartvdrmeulen@gmail.com> Signed-off-by: Remy Bohmer <linux@bohmer.net>
Diffstat (limited to 'patches')
-rw-r--r--patches/setserial-2.17/series1
-rw-r--r--patches/setserial-2.17/setserial-tiocghayesesp-build-fix.patch28
2 files changed, 29 insertions, 0 deletions
diff --git a/patches/setserial-2.17/series b/patches/setserial-2.17/series
new file mode 100644
index 000000000..69fa03b25
--- /dev/null
+++ b/patches/setserial-2.17/series
@@ -0,0 +1 @@
+setserial-tiocghayesesp-build-fix.patch
diff --git a/patches/setserial-2.17/setserial-tiocghayesesp-build-fix.patch b/patches/setserial-2.17/setserial-tiocghayesesp-build-fix.patch
new file mode 100644
index 000000000..dbe11d7dd
--- /dev/null
+++ b/patches/setserial-2.17/setserial-tiocghayesesp-build-fix.patch
@@ -0,0 +1,28 @@
+[PATCH] setserial: fix build with 2.6.33+ kernel headers
+
+linux/hayesesp.h got removed in 2.6.33, but some archs (like x86) still
+define the TIOCGHAYESESP ioctl, breaking the build.
+
+It's very unlikely to be of interest anymore, so just undef it.
+
+Signed-off-by: Peter Korsgaard <jacmet at sunsite.dk>
+---
+ setserial.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+Index: setserial-2.17/setserial.c
+===================================================================
+--- setserial-2.17.orig/setserial.c
++++ setserial-2.17/setserial.c
+@@ -24,6 +24,11 @@
+ #endif
+ #include <linux/serial.h>
+
++/* linux/hayesesp.h got removed in 2.6.33 but some archs (like x86)
++ still define TIOCGHAYESESP. It's very unlikely to be of interest
++ anymore, so just undef it */
++#undef TIOCGHAYESESP
++
+ #include "version.h"
+
+ static char version_str[] = "setserial version " SETSERIAL_VERSION ", "