summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-05-06 14:43:34 -0400
committerJohn W. Linville <linville@tuxdriver.com>2014-05-06 14:43:34 -0400
commit68b422db3d93878c71200c27e2bffd1c57f72974 (patch)
treed23b9d6a76d55678898f1246461d2abba5b1bcc9 /arch/arm
parent48d11dc37977614a461bfedddc52d1c651bc279f (diff)
parent781d4e0fb73379e251d1ac1562fe9892da711760 (diff)
downloadop-kernel-dev-68b422db3d93878c71200c27e2bffd1c57f72974.zip
op-kernel-dev-68b422db3d93878c71200c27e2bffd1c57f72974.tar.gz
Merge branch 'rfkill-gpio-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-tegra/board-paz00.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach-tegra/board-paz00.c
index e4dec9f..9c6029b 100644
--- a/arch/arm/mach-tegra/board-paz00.c
+++ b/arch/arm/mach-tegra/board-paz00.c
@@ -23,9 +23,7 @@
#include "board.h"
static struct rfkill_gpio_platform_data wifi_rfkill_platform_data = {
- .name = "wifi_rfkill",
- .reset_gpio = 25, /* PD1 */
- .shutdown_gpio = 85, /* PK5 */
+ .name = "wifi_rfkill",
.type = RFKILL_TYPE_WLAN,
};
OpenPOWER on IntegriCloud