diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-12 15:28:39 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2012-11-12 15:28:39 +0100 |
| commit | f987e832a9e79d2ce8009a5ea9c7b677624b3b30 (patch) | |
| tree | 0dd09a5e6b4c60ee0a9916907dfc2cda83f3e496 /drivers/misc/bcm4329_rfkill.c | |
| parent | f737b7f46a72c099cf8ac88baff02fbf61b1a47c (diff) | |
| parent | fc993d9bc48f772133d8cd156c67c296477db070 (diff) | |
Merge branch 'l4t/l4t-r16-r2' into colibri
Conflicts:
arch/arm/mach-tegra/tegra3_usb_phy.c
arch/arm/mach-tegra/usb_phy.c
drivers/usb/gadget/tegra_udc.c
drivers/usb/otg/Makefile
drivers/video/tegra/fb.c
sound/soc/tegra/tegra_pcm.c
Diffstat (limited to 'drivers/misc/bcm4329_rfkill.c')
| -rw-r--r-- | drivers/misc/bcm4329_rfkill.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/misc/bcm4329_rfkill.c b/drivers/misc/bcm4329_rfkill.c index 9dc33fd51e59..a2d5ca6699cc 100644 --- a/drivers/misc/bcm4329_rfkill.c +++ b/drivers/misc/bcm4329_rfkill.c @@ -107,7 +107,6 @@ static int bcm4329_rfkill_probe(struct platform_device *pdev) "bcm4329_nreset_gpio"); if (res) { bcm4329_rfkill->gpio_reset = res->start; - tegra_gpio_enable(bcm4329_rfkill->gpio_reset); ret = gpio_request(bcm4329_rfkill->gpio_reset, "bcm4329_nreset_gpio"); } else { @@ -121,7 +120,6 @@ static int bcm4329_rfkill_probe(struct platform_device *pdev) "bcm4329_nshutdown_gpio"); if (res) { bcm4329_rfkill->gpio_shutdown = res->start; - tegra_gpio_enable(bcm4329_rfkill->gpio_shutdown); ret = gpio_request(bcm4329_rfkill->gpio_shutdown, "bcm4329_nshutdown_gpio"); } else { |