diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-27 15:40:36 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-27 15:40:36 +0000 |
| commit | 78240e37963ac6f4483f6473c786c0f0ab7e78fe (patch) | |
| tree | dbb1a62ec2efe4bd14ce2a7f2d8abe76b812ccb3 /arch/arm/mach-pxa/tosa-bt.c | |
| parent | 59a4f92a3612f3c3ea4c13b43e0e50ae66abfa7b (diff) | |
| parent | fa4704fee22df9c24297305288b53ba8aae527b4 (diff) | |
| download | talos-obmc-linux-78240e37963ac6f4483f6473c786c0f0ab7e78fe.tar.gz talos-obmc-linux-78240e37963ac6f4483f6473c786c0f0ab7e78fe.zip | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
Diffstat (limited to 'arch/arm/mach-pxa/tosa-bt.c')
| -rw-r--r-- | arch/arm/mach-pxa/tosa-bt.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/tosa-bt.c b/arch/arm/mach-pxa/tosa-bt.c index c31e601eb49c..b9b1e5c2b290 100644 --- a/arch/arm/mach-pxa/tosa-bt.c +++ b/arch/arm/mach-pxa/tosa-bt.c @@ -81,8 +81,6 @@ static int tosa_bt_probe(struct platform_device *dev) goto err_rfk_alloc; } - rfkill_set_led_trigger_name(rfk, "tosa-bt"); - rc = rfkill_register(rfk); if (rc) goto err_rfkill; |
