From cda7b61bd05a7a6de519ffef3a267a72b2fb905f Mon Sep 17 00:00:00 2001 From: Ming Lei Date: Mon, 28 Mar 2011 06:10:25 +0100 Subject: [PATCH] --- yaml --- r: 243447 b: refs/heads/master c: 8e8806990cfd91a4ec25df6f00528008c4b0087a h: refs/heads/master i: 243445: 21dfbad853bc9ae72f36d932fb5e4414275574b5 243443: 631d7df6244da367b92459e6c0aa3a5ff4556efa 243439: c221462c4016640e6fd0644cebb4588f0d373d08 v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/etm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5ea3ef086aa9..4e70bf4dbfb7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f479c64a52094354c10309fcacaa71de015dc9e +refs/heads/master: 8e8806990cfd91a4ec25df6f00528008c4b0087a diff --git a/trunk/arch/arm/kernel/etm.c b/trunk/arch/arm/kernel/etm.c index 052b509e2d5f..1bec8b5f22f0 100644 --- a/trunk/arch/arm/kernel/etm.c +++ b/trunk/arch/arm/kernel/etm.c @@ -338,7 +338,7 @@ static struct miscdevice etb_miscdev = { .fops = &etb_fops, }; -static int __init etb_probe(struct amba_device *dev, const struct amba_id *id) +static int __devinit etb_probe(struct amba_device *dev, const struct amba_id *id) { struct tracectx *t = &tracer; int ret = 0; @@ -530,7 +530,7 @@ static ssize_t trace_mode_store(struct kobject *kobj, static struct kobj_attribute trace_mode_attr = __ATTR(trace_mode, 0644, trace_mode_show, trace_mode_store); -static int __init etm_probe(struct amba_device *dev, const struct amba_id *id) +static int __devinit etm_probe(struct amba_device *dev, const struct amba_id *id) { struct tracectx *t = &tracer; int ret = 0;