[cavium-octeon] update to 2.6.30-rc5

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.23 / 902-darwin_scripts_include.patch

diff --git a/target/linux/generic-2.6/patches-2.6.23/902-darwin_scripts_include.patch b/target/linux/generic-2.6/patches-2.6.23/902-darwin_scripts_include.patch
index 2a3a1e0..29eeeb3 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.23/902-darwin_scripts_include.patch
+++ b/target/linux/generic-2.6/patches-2.6.23/902-darwin_scripts_include.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.23-rc6/scripts/genksyms/parse.c_shipped
-===================================================================
---- linux-2.6.23-rc6.orig/scripts/genksyms/parse.c_shipped     2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/scripts/genksyms/parse.c_shipped  2007-09-21 16:24:10.000000000 +0800
+--- a/scripts/genksyms/parse.c_shipped
++++ b/scripts/genksyms/parse.c_shipped

 @@ -144,7 +144,9 @@
  
  
 @@ -144,7 +144,9 @@
  
  


@@ -12,10 +10,8 @@ Index: linux-2.6.23-rc6/scripts/genksyms/parse.c_shipped
  #include "genksyms.h"
  
  static int is_typedef;
  #include "genksyms.h"
  
  static int is_typedef;

-Index: linux-2.6.23-rc6/scripts/genksyms/parse.y
-===================================================================
---- linux-2.6.23-rc6.orig/scripts/genksyms/parse.y     2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/scripts/genksyms/parse.y  2007-09-21 16:24:10.000000000 +0800
+--- a/scripts/genksyms/parse.y
++++ b/scripts/genksyms/parse.y

 @@ -24,7 +24,9 @@
  %{
  
 @@ -24,7 +24,9 @@
  %{
  


@@ -26,10 +22,8 @@ Index: linux-2.6.23-rc6/scripts/genksyms/parse.y
  #include "genksyms.h"
  
  static int is_typedef;
  #include "genksyms.h"
  
  static int is_typedef;

-Index: linux-2.6.23-rc6/scripts/kallsyms.c
-===================================================================
---- linux-2.6.23-rc6.orig/scripts/kallsyms.c   2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/scripts/kallsyms.c        2007-09-21 16:24:10.000000000 +0800
+--- a/scripts/kallsyms.c
++++ b/scripts/kallsyms.c

 @@ -28,6 +28,35 @@
  #include <stdlib.h>
  #include <string.h>
 @@ -28,6 +28,35 @@
  #include <stdlib.h>
  #include <string.h>


@@ -66,11 +60,9 @@ Index: linux-2.6.23-rc6/scripts/kallsyms.c
  
  #define KSYM_NAME_LEN         128
  
  
  #define KSYM_NAME_LEN         128
  

-Index: linux-2.6.23-rc6/scripts/kconfig/Makefile
-===================================================================
---- linux-2.6.23-rc6.orig/scripts/kconfig/Makefile     2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/scripts/kconfig/Makefile  2007-09-21 16:24:10.000000000 +0800
-@@ -88,6 +88,9 @@
+--- a/scripts/kconfig/Makefile
++++ b/scripts/kconfig/Makefile
+@@ -88,6 +88,9 @@ check-lxdialog  := $(srctree)/$(src)/lxd

  # we really need to do so. (Do not call gcc as part of make mrproper)
  HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
  HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
  # we really need to do so. (Do not call gcc as part of make mrproper)
  HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
  HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))


@@ -80,10 +72,8 @@ Index: linux-2.6.23-rc6/scripts/kconfig/Makefile
  
  HOST_EXTRACFLAGS += -DLOCALE
  
  
  HOST_EXTRACFLAGS += -DLOCALE
  

-Index: linux-2.6.23-rc6/scripts/mod/mk_elfconfig.c
-===================================================================
---- linux-2.6.23-rc6.orig/scripts/mod/mk_elfconfig.c   2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/scripts/mod/mk_elfconfig.c        2007-09-21 16:24:10.000000000 +0800
+--- a/scripts/mod/mk_elfconfig.c
++++ b/scripts/mod/mk_elfconfig.c

 @@ -1,7 +1,11 @@
  #include <stdio.h>
  #include <stdlib.h>
 @@ -1,7 +1,11 @@
  #include <stdio.h>
  #include <stdlib.h>


@@ -96,10 +86,8 @@ Index: linux-2.6.23-rc6/scripts/mod/mk_elfconfig.c
  
  int
  main(int argc, char **argv)
  
  int
  main(int argc, char **argv)

-Index: linux-2.6.23-rc6/scripts/mod/modpost.h
-===================================================================
---- linux-2.6.23-rc6.orig/scripts/mod/modpost.h        2007-09-21 16:23:51.000000000 +0800
-+++ linux-2.6.23-rc6/scripts/mod/modpost.h     2007-09-21 16:24:10.000000000 +0800
+--- a/scripts/mod/modpost.h
++++ b/scripts/mod/modpost.h

 @@ -7,7 +7,11 @@
  #include <sys/mman.h>
  #include <fcntl.h>
 @@ -7,7 +7,11 @@
  #include <sys/mman.h>
  #include <fcntl.h>