Changeset 30534


Ignore:
Timestamp:
2012-02-14T20:07:05+01:00 (6 years ago)
Author:
blogic
Message:

[lantiq] fix compile error in previous commit

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/lantiq/patches/206-owrt-brnboot.patch

    r30532 r30534  
    1 Index: linux-3.1.9/drivers/mtd/mtdpart.c 
     1Index: linux-3.1.10/drivers/mtd/mtdpart.c 
    22=================================================================== 
    3 --- linux-3.1.9.orig/drivers/mtd/mtdpart.c      2012-01-29 22:55:30.295904157 +0100 
    4 +++ linux-3.1.9/drivers/mtd/mtdpart.c   2012-01-29 22:55:30.395904294 +0100 
     3--- linux-3.1.10.orig/drivers/mtd/mtdpart.c     2012-02-14 19:38:40.102266817 +0100 
     4+++ linux-3.1.10/drivers/mtd/mtdpart.c  2012-02-14 19:38:40.146266819 +0100 
    55@@ -899,6 +899,38 @@ 
    66        return le32_to_cpu(temp) == SQUASHFS_MAGIC; 
     
    5656  
    5757        if (!detect_squashfs_partition(mtd, 
    58 Index: linux-3.1.9/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h 
     58Index: linux-3.1.10/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h 
    5959=================================================================== 
    60 --- linux-3.1.9.orig/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h        2012-01-29 22:55:30.195904014 +0100 
    61 +++ linux-3.1.9/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h     2012-01-29 22:55:30.395904294 +0100 
     60--- linux-3.1.10.orig/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h       2012-02-14 19:38:40.058266816 +0100 
     61+++ linux-3.1.10/arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h    2012-02-14 19:57:07.790314179 +0100 
    6262@@ -149,6 +149,7 @@ 
    6363  
    6464 extern __iomem void *ltq_ebu_membase; 
    6565 extern __iomem void *ltq_cgu_membase; 
    66 +extern long ltq_brn_boot; 
     66+extern unsigned long ltq_brn_boot; 
    6767  
    6868 /* request a non-gpio and set the PIO config */ 
    6969 extern int  ltq_gpio_request(unsigned int pin, unsigned int alt0, 
    70 Index: linux-3.1.9/arch/mips/lantiq/setup.c 
     70Index: linux-3.1.10/arch/mips/lantiq/setup.c 
    7171=================================================================== 
    72 --- linux-3.1.9.orig/arch/mips/lantiq/setup.c   2012-01-29 22:55:30.095903875 +0100 
    73 +++ linux-3.1.9/arch/mips/lantiq/setup.c        2012-01-29 22:59:28.686237119 +0100 
     72--- linux-3.1.10.orig/arch/mips/lantiq/setup.c  2012-02-14 19:38:40.010266814 +0100 
     73+++ linux-3.1.10/arch/mips/lantiq/setup.c       2012-02-14 19:38:40.150266820 +0100 
    7474@@ -20,6 +20,8 @@ 
    7575  
Note: See TracChangeset for help on using the changeset viewer.