mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 17:01:14 +00:00
11baab9fac
This makes the components used on the lantiq SoCs compile with kernel 6.1. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> [also fix ifxmips_ptm_adsl.c] Signed-off-by: Martin Schiller <ms@dev.tdt.de>
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
--- a/ifxmips_ptm_adsl.c
|
|
+++ b/ifxmips_ptm_adsl.c
|
|
@@ -180,7 +180,7 @@ static int proc_read_version(char *, cha
|
|
static int proc_read_wanmib(char *, char **, off_t, int, int *, void *);
|
|
static int proc_write_wanmib(struct file *, const char *, unsigned long, void *);
|
|
#endif
|
|
-#if defined(ENABLE_FW_PROC) && ENABLE_FW_PROC
|
|
+#if defined(ENABLE_FW_PROC) && ENABLE_FW_PROC && defined(ENABLE_DBG_PROC) && ENABLE_DBG_PROC
|
|
static int proc_read_genconf(char *, char **, off_t, int, int *, void *);
|
|
#endif
|
|
#if defined(ENABLE_DBG_PROC) && ENABLE_DBG_PROC
|
|
@@ -191,8 +191,8 @@ static int proc_write_wanmib(struct file
|
|
/*
|
|
* Proc Help Functions
|
|
*/
|
|
-static INLINE int stricmp(const char *, const char *);
|
|
#if defined(ENABLE_DBG_PROC) && ENABLE_DBG_PROC
|
|
+ static INLINE int stricmp(const char *, const char *);
|
|
static INLINE int strincmp(const char *, const char *, int);
|
|
#endif
|
|
static INLINE int ifx_ptm_version(char *);
|
|
@@ -1159,8 +1159,6 @@ static int proc_write_dbg(struct file *f
|
|
return count;
|
|
}
|
|
|
|
-#endif // defined(ENABLE_DBG_PROC) && ENABLE_DBG_PROC
|
|
-
|
|
static INLINE int stricmp(const char *p1, const char *p2)
|
|
{
|
|
int c1, c2;
|
|
@@ -1178,7 +1176,6 @@ static INLINE int stricmp(const char *p1
|
|
return *p1 - *p2;
|
|
}
|
|
|
|
-#if defined(ENABLE_DBG_PROC) && ENABLE_DBG_PROC
|
|
static INLINE int strincmp(const char *p1, const char *p2, int n)
|
|
{
|
|
int c1 = 0, c2;
|