← Back to branch summary

~ubuntu-branches/ubuntu/saucy/linux-ti-omap4/saucy-proposed

« back to all changes in this revision

Viewing changes to arch/arm/mach-pxa/balloon3.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Stefan Bader, Upstream Kernel Changes
  • Date: 2012-08-15 17:17:43 UTC
  • Revision ID: package-import@ubuntu.com-20120815171743-h5wnuf51xe7pvdid
Tags: 3.5.0-207.13
[ Paolo Pisati ]

* Start new release

[ Stefan Bader ]

* (config) Enable getabis to use local package copies

[ Upstream Kernel Changes ]

* fixup: gargabe collect iva_seq[0|1] init
* [Config] enable all SND_OMAP_SOC_*s
* fixup: cm2xxx_3xxx.o is needed for omap2_cm_read|write_reg
* fixup: add some snd_soc_dai* helper functions
* fixup: s/snd_soc_dpcm_params/snd_soc_dpcm/g
* fixup: typo, no_host_mode and useless SDP4430 init
* fixup: enable again aess hwmod

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/mach-pxa/balloon3.c
679
679
        },
680
680
};
681
681
 
682
 
static const char *balloon3_part_probes[] = { "cmdlinepart", NULL };
683
 
 
684
682
struct platform_nand_data balloon3_nand_pdata = {
685
683
        .chip = {
686
684
                .nr_chips       = 4,
688
686
                .nr_partitions  = ARRAY_SIZE(balloon3_partition_info),
689
687
                .partitions     = balloon3_partition_info,
690
688
                .chip_delay     = 50,
691
 
                .part_probe_types = balloon3_part_probes,
692
689
        },
693
690
        .ctrl = {
694
691
                .hwcontrol      = 0,
732
729
#if defined(CONFIG_REGULATOR_MAX1586) || \
733
730
    defined(CONFIG_REGULATOR_MAX1586_MODULE)
734
731
static struct regulator_consumer_supply balloon3_max1587a_consumers[] = {
735
 
        {
736
 
                .supply = "vcc_core",
737
 
        }
 
732
        REGULATOR_SUPPLY("vcc_core", NULL),
738
733
};
739
734
 
740
735
static struct regulator_init_data balloon3_max1587a_v3_info = {