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 @@
 2010/06/16
 Created-by: Jeff Dike <jdike@linux.intel.com>
 
+# remove additional IOCTL defines that were in arch specific headers
+
+2010/09/02
+Created-by: Saul Wold <saul.wold@intel.com>
+
 Index: linux-2.6.34/include/asm-generic/ioctls.h
 ===================================================================
 --- linux-2.6.34.orig/include/asm-generic/ioctls.h
@@ -26,3 +31,16 @@ Index: linux-2.6.34/include/asm-generic/ioctls.h
  /* Used for packet mode */
  #define TIOCPKT_DATA            0
  #define TIOCPKT_FLUSHREAD       1
+
+Index: linux-2.6.34/include/asm-generic/ioctls.h
+===================================================================
+--- linux-2.6.34/arch/mips/include/asm/ioctls.h 2010-05-16 14:17:36.000000000 -0700
++++ linux-2.6.34_fixed/arch/mips/include/asm/ioctls.h   2010-09-02 14:54:14.641763250 -0700
+@@ -103,7 +103,5 @@
+ #define TIOCSERSETMULTI 0x5490 /* Set multiport config */
+ #define TIOCMIWAIT      0x5491 /* wait for a change on serial input line(s) */
+ #define TIOCGICOUNT     0x5492 /* read serial port inline interrupt counts */
+-#define TIOCGHAYESESP  0x5493 /* Get Hayes ESP configuration */
+-#define TIOCSHAYESESP  0x5494 /* Set Hayes ESP configuration */
+ 
+ #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
 
 INHIBIT_DEFAULT_DEPS = "1"
 DEPENDS += "unifdef-native"
-PR = "r0"
+PR = "r1"
 
 SRC_URI += "file://hayes-gone.patch \
            file://ppc_glibc_build_fix.patch"