diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-05-06 20:43:34 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-05-06 20:43:34 +0200 |
| commit | 68b422db3d93878c71200c27e2bffd1c57f72974 (patch) | |
| tree | d23b9d6a76d55678898f1246461d2abba5b1bcc9 /arch/arm | |
| parent | rsi: Changing opcode for sta mode according to changes in firmware (diff) | |
| parent | net: rfkill: gpio: hard-code the gpio names (diff) | |
| download | linux-68b422db3d93878c71200c27e2bffd1c57f72974.tar.xz linux-68b422db3d93878c71200c27e2bffd1c57f72974.zip | |
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.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, }; |