diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-05-27 19:51:31 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-05-27 19:51:31 +0200 |
commit | 9db7cb6901740453a442e598563b576987dd471b (patch) | |
tree | e38911285b5cd9980280a92ea0e0260f6c1ef2ad /arch/arm | |
parent | Merge branch 'net-sysfs-docs' (diff) | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
download | linux-9db7cb6901740453a442e598563b576987dd471b.tar.xz linux-9db7cb6901740453a442e598563b576987dd471b.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-tegra/board-paz00.c | 4 |
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 e4dec9fcb084..9c6029ba526f 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, }; |