aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.21/30-fix_conflicting_getline.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2009-11-08 21:56:59 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2009-11-08 21:56:59 +0000
commit343e9ffa203702c68e846fd3618ed6b30c2a8713 (patch)
tree8970b881c98964509c8b6dc48a7c7b91095a5e92 /target/linux/generic-2.6/patches-2.6.21/30-fix_conflicting_getline.patch
parentae0457f76a2a1e67cd0231e978c19911fe386064 (diff)
downloadupstream-343e9ffa203702c68e846fd3618ed6b30c2a8713.tar.gz
upstream-343e9ffa203702c68e846fd3618ed6b30c2a8713.tar.bz2
upstream-343e9ffa203702c68e846fd3618ed6b30c2a8713.zip
Add some build fixes for kernel 2.6.21 and the infineon amazon target.
Now it compiles with the new toolchain. These are mostly backports from mainline linux and newer linux kernels from openwrt. SVN-Revision: 18345
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.21/30-fix_conflicting_getline.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.21/30-fix_conflicting_getline.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.21/30-fix_conflicting_getline.patch b/target/linux/generic-2.6/patches-2.6.21/30-fix_conflicting_getline.patch
new file mode 100644
index 0000000000..0a68134f7a
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.21/30-fix_conflicting_getline.patch
@@ -0,0 +1,29 @@
+--- a/scripts/unifdef.c
++++ b/scripts/unifdef.c
+@@ -206,7 +206,7 @@ static void done(void);
+ static void error(const char *);
+ static int findsym(const char *);
+ static void flushline(bool);
+-static Linetype getline(void);
++static Linetype get_line(void);
+ static Linetype ifeval(const char **);
+ static void ignoreoff(void);
+ static void ignoreon(void);
+@@ -512,7 +512,7 @@ process(void)
+
+ for (;;) {
+ linenum++;
+- lineval = getline();
++ lineval = get_line();
+ trans_table[ifstate[depth]][lineval]();
+ debug("process %s -> %s depth %d",
+ linetype_name[lineval],
+@@ -526,7 +526,7 @@ process(void)
+ * help from skipcomment().
+ */
+ static Linetype
+-getline(void)
++get_line(void)
+ {
+ const char *cp;
+ int cursym;