Changeset 2729


Ignore:
Timestamp:
2005-12-19T00:48:55+01:00 (12 years ago)
Author:
wbx
Message:

remove duplicate code

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/target/linux/linux-2.6/patches/brcm/002-flash-map.patch

    r2728 r2729  
    11diff -Nur linux-2.6.15-rc5/drivers/mtd/maps/bcm47xx-flash.c linux-2.6.15-rc5-flash/drivers/mtd/maps/bcm47xx-flash.c 
    22--- linux-2.6.15-rc5/drivers/mtd/maps/bcm47xx-flash.c   1970-01-01 01:00:00.000000000 +0100 
    3 +++ linux-2.6.15-rc5-flash/drivers/mtd/maps/bcm47xx-flash.c     2005-12-18 23:40:45.060006250 +0100 
    4 @@ -0,0 +1,321 @@ 
     3+++ linux-2.6.15-rc5-flash/drivers/mtd/maps/bcm47xx-flash.c     2005-12-19 00:33:31.276241000 +0100 
     4@@ -0,0 +1,316 @@ 
    55+/* 
    66+ *  Copyright (C) 2004 Florian Schirmer (jolt@tuxbox.org) 
     
    227227+               /* entirely jffs2 */ 
    228228+               bcm947xx_parts[4].name = NULL; 
    229 +               if (cfe_size_flag == 0) { 
    230 +                       bcm947xx_parts[2].size = size - bcm947xx_parts[2].offset -  
    231 +                               bcm947xx_parts[3].size; 
    232 +               } else { 
    233 +                       bcm947xx_parts[2].size = size - bcm947xx_parts[2].offset -  
    234 +                               bcm947xx_parts[3].size;  
    235 +               } 
     229+               bcm947xx_parts[2].size = size - bcm947xx_parts[2].offset -  
     230+                       bcm947xx_parts[3].size; 
    236231+       } else { 
    237232+               /* legacy setup */ 
Note: See TracChangeset for help on using the changeset viewer.