← Back to branch summary

~ubuntu-branches/ubuntu/trusty/linux-linaro-u8500/trusty

« back to all changes in this revision

Viewing changes to arch/arm/kernel/etm.c

  • Committer: Bazaar Package Importer
  • Author(s): John Rigby, Upstream Fixes, Andy Green, John Rigby
  • Date: 2011-04-14 12:16:06 UTC
  • Revision ID: james.westby@ubuntu.com-20110414121606-b77podkyqgr2oix7
Tags: 2.6.38-1002.3
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/747639
https://launchpad.net/bugs/752900
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/732842
https://launchpad.net/bugs/732912
[ Upstream Fixes ]

* MUSB: shutdown: Make sure block is awake before doing shutdown
  - LP: #745737
* Fixed gpio polarity of gpio USB-phy reset.
  - LP: #747639

[ Andy Green ]

* LINARO: SAUCE: disable CONFIG_OMAP_RESET_CLOCKS
  - LP: #752900

[ John Rigby ]

* Rebase to new upstreams:
  Linux v2.6.38.1
  linaro-linux-2.6.38-upstream-29Mar2011
  Ubuntu-2.6.38-7.35
* SAUCE: OMAP4: clock: wait for module to become accessible on
  a clk enable
  - LP: #745737
* Rebase to new upstreams:
  Linux v2.6.38.2
  linaro-linux-2.6.38-upstream-5Apr2011
  Ubuntu-2.6.38-8.41
  - LP: #732842
* Update configs for device tree, dvfs and lttng
* LINARO: add building of dtb's
* LINARO: SAUCE: Disable lowest operating freqs on omap34xx
  - LP: #732912

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/kernel/etm.c
338
338
        .fops = &etb_fops,
339
339
};
340
340
 
341
 
static int __init etb_probe(struct amba_device *dev, const struct amba_id *id)
 
341
static int __devinit etb_probe(struct amba_device *dev, const struct amba_id *id)
342
342
{
343
343
        struct tracectx *t = &tracer;
344
344
        int ret = 0;
530
530
static struct kobj_attribute trace_mode_attr =
531
531
        __ATTR(trace_mode, 0644, trace_mode_show, trace_mode_store);
532
532
 
533
 
static int __init etm_probe(struct amba_device *dev, const struct amba_id *id)
 
533
static int __devinit etm_probe(struct amba_device *dev, const struct amba_id *id)
534
534
{
535
535
        struct tracectx *t = &tracer;
536
536
        int ret = 0;