summaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c24xx/h1940-bluetooth.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-01-19 15:27:30 (GMT)
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-01-19 15:27:30 (GMT)
commit210b1847b32951f52d19df229972399e5b987de2 (patch)
treebe6eeb3ba76b4f4331c98d5ba47aa233bea8f22d /arch/arm/mach-s3c24xx/h1940-bluetooth.c
parent93d5bf073a1e01035be66dc41860b9ae9aa9ccfa (diff)
parentd01723479e6a6c70c83295f7847477a016d5e14a (diff)
downloadlinux-fsl-qoriq-210b1847b32951f52d19df229972399e5b987de2.tar.xz
Merge branch 'for-rmk/virt/hyp-boot/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into fixes
Diffstat (limited to 'arch/arm/mach-s3c24xx/h1940-bluetooth.c')
-rw-r--r--arch/arm/mach-s3c24xx/h1940-bluetooth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c24xx/h1940-bluetooth.c b/arch/arm/mach-s3c24xx/h1940-bluetooth.c
index 57aee91..3f40c61 100644
--- a/arch/arm/mach-s3c24xx/h1940-bluetooth.c
+++ b/arch/arm/mach-s3c24xx/h1940-bluetooth.c
@@ -62,7 +62,7 @@ static const struct rfkill_ops h1940bt_rfkill_ops = {
.set_block = h1940bt_set_block,
};
-static int __devinit h1940bt_probe(struct platform_device *pdev)
+static int h1940bt_probe(struct platform_device *pdev)
{
struct rfkill *rfk;
int ret = 0;