Ignore:
Timestamp:
2012-04-29T09:36:43+02:00 (4 years ago)
Author:
juhosg
Message:

adm5120: merge 3.3 patches

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/adm5120/files/arch/mips/adm5120/motorola/pmugw.c

    r21680 r31511  
    2727#define PMUGW_CONFIG_SIZE       0x1000 
    2828 
    29 #ifdef CONFIG_MTD_PARTITIONS 
    3029static struct mtd_partition pmugw_partitions[] = { 
    3130        { 
     
    4443        } 
    4544}; 
    46 #endif /* CONFIG_MTD_PARTITIONS */ 
    4745 
    4846static u8 pmugw_vlans[6] __initdata = { 
     
    8381        adm5120_flash0_data.switch_bank = switch_bank_gpio5; 
    8482 
    85 #ifdef CONFIG_MTD_PARTITIONS 
    8683        adm5120_flash0_data.nr_parts = ARRAY_SIZE(pmugw_partitions); 
    8784        adm5120_flash0_data.parts = pmugw_partitions; 
    88 #endif /* CONFIG_MTD_PARTITIONS */ 
    8985 
    9086        adm5120_add_device_uart(1); /* ttyS0 */ 
Note: See TracChangeset for help on using the changeset viewer.