summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <Saul.Wold@intel.com>2010-09-02 15:03:19 -0700
committerSaul Wold <Saul.Wold@intel.com>2010-09-02 15:19:34 -0700
commit893713352a447a0813e44fdc173be8b8c73bfdf3 (patch)
tree523e639dcc997d1c1c688a1fbbfb0c7da53b7db1 /meta
parentc840412b694bb09d5c33ca445beb7aef79dfdc0d (diff)
downloadpoky-893713352a447a0813e44fdc173be8b8c73bfdf3.tar.gz
linux-libc-headers: update hayes-gone patch to remove HAYES ioctls from mips
Signed-off-by: Saul Wold <Saul.Wold@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers/hayes-gone.patch18
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.34.bb2
2 files changed, 19 insertions, 1 deletions
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/hayes-gone.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/hayes-gone.patch
index 719c320202..664995e9ef 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/hayes-gone.patch
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/hayes-gone.patch
@@ -5,6 +5,11 @@
52010/06/16 52010/06/16
6Created-by: Jeff Dike <jdike@linux.intel.com> 6Created-by: Jeff Dike <jdike@linux.intel.com>
7 7
8# remove additional IOCTL defines that were in arch specific headers
9
102010/09/02
11Created-by: Saul Wold <saul.wold@intel.com>
12
8Index: linux-2.6.34/include/asm-generic/ioctls.h 13Index: linux-2.6.34/include/asm-generic/ioctls.h
9=================================================================== 14===================================================================
10--- linux-2.6.34.orig/include/asm-generic/ioctls.h 15--- linux-2.6.34.orig/include/asm-generic/ioctls.h
@@ -26,3 +31,16 @@ Index: linux-2.6.34/include/asm-generic/ioctls.h
26 /* Used for packet mode */ 31 /* Used for packet mode */
27 #define TIOCPKT_DATA 0 32 #define TIOCPKT_DATA 0
28 #define TIOCPKT_FLUSHREAD 1 33 #define TIOCPKT_FLUSHREAD 1
34
35Index: linux-2.6.34/include/asm-generic/ioctls.h
36===================================================================
37--- linux-2.6.34/arch/mips/include/asm/ioctls.h 2010-05-16 14:17:36.000000000 -0700
38+++ linux-2.6.34_fixed/arch/mips/include/asm/ioctls.h 2010-09-02 14:54:14.641763250 -0700
39@@ -103,7 +103,5 @@
40 #define TIOCSERSETMULTI 0x5490 /* Set multiport config */
41 #define TIOCMIWAIT 0x5491 /* wait for a change on serial input line(s) */
42 #define TIOCGICOUNT 0x5492 /* read serial port inline interrupt counts */
43-#define TIOCGHAYESESP 0x5493 /* Get Hayes ESP configuration */
44-#define TIOCSHAYESESP 0x5494 /* Set Hayes ESP configuration */
45
46 #endif /* __ASM_IOCTLS_H */
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.34.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.34.bb
index 31c305854f..6427450c92 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.34.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.34.bb
@@ -2,7 +2,7 @@ require linux-libc-headers.inc
2 2
3INHIBIT_DEFAULT_DEPS = "1" 3INHIBIT_DEFAULT_DEPS = "1"
4DEPENDS += "unifdef-native" 4DEPENDS += "unifdef-native"
5PR = "r0" 5PR = "r1"
6 6
7SRC_URI += "file://hayes-gone.patch \ 7SRC_URI += "file://hayes-gone.patch \
8 file://ppc_glibc_build_fix.patch" 8 file://ppc_glibc_build_fix.patch"