diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-10 16:37:52 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-10 16:37:52 +0900 |
| commit | 7a73c81ec37c0c59ee04d4f6eb05c9b7b1413741 (patch) | |
| tree | bc5d9770473e9fbdc6ee59b2aa359dcfafe6809f /arch/sh/kernel/cpu | |
| parent | 4414d38a8845b229a8e7ea0105fe1bb263b65993 (diff) | |
| parent | abef364050bcf8f46b0cb4bd47947ec2951664d3 (diff) | |
| download | blackbird-op-linux-7a73c81ec37c0c59ee04d4f6eb05c9b7b1413741.tar.gz blackbird-op-linux-7a73c81ec37c0c59ee04d4f6eb05c9b7b1413741.zip | |
Merge branch 'sh/urgent' into sh-latest
Diffstat (limited to 'arch/sh/kernel/cpu')
| -rw-r--r-- | arch/sh/kernel/cpu/sh4/sq.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c index a8140f0bbf6c..0a47bd3e7bee 100644 --- a/arch/sh/kernel/cpu/sh4/sq.c +++ b/arch/sh/kernel/cpu/sh4/sq.c @@ -337,7 +337,7 @@ static struct kobj_type ktype_percpu_entry = { .default_attrs = sq_sysfs_attrs, }; -static int __devinit sq_dev_add(struct device *dev) +static int sq_dev_add(struct device *dev, struct subsys_interface *sif) { unsigned int cpu = dev->id; struct kobject *kobj; @@ -355,7 +355,7 @@ static int __devinit sq_dev_add(struct device *dev) return error; } -static int __devexit sq_dev_remove(struct device *dev) +static int sq_dev_remove(struct device *dev, struct subsys_interface *sif) { unsigned int cpu = dev->id; struct kobject *kobj = sq_kobject[cpu]; @@ -365,10 +365,10 @@ static int __devexit sq_dev_remove(struct device *dev) } static struct subsys_interface sq_interface = { - .name = "sq" + .name = "sq", .subsys = &cpu_subsys, .add_dev = sq_dev_add, - .remove_dev = __devexit_p(sq_dev_remove), + .remove_dev = sq_dev_remove, }; static int __init sq_api_init(void) |
