diff options
Diffstat (limited to 'drivers/platform/x86/asus-laptop.c')
-rw-r--r-- | drivers/platform/x86/asus-laptop.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c index 475ab50732ab..efe8f6388906 100644 --- a/drivers/platform/x86/asus-laptop.c +++ b/drivers/platform/x86/asus-laptop.c | |||
@@ -49,6 +49,7 @@ | |||
49 | #include <linux/input.h> | 49 | #include <linux/input.h> |
50 | #include <linux/input/sparse-keymap.h> | 50 | #include <linux/input/sparse-keymap.h> |
51 | #include <linux/rfkill.h> | 51 | #include <linux/rfkill.h> |
52 | #include <linux/slab.h> | ||
52 | #include <acpi/acpi_drivers.h> | 53 | #include <acpi/acpi_drivers.h> |
53 | #include <acpi/acpi_bus.h> | 54 | #include <acpi/acpi_bus.h> |
54 | 55 | ||
@@ -78,15 +79,15 @@ static uint wapf = 1; | |||
78 | module_param(wapf, uint, 0644); | 79 | module_param(wapf, uint, 0644); |
79 | MODULE_PARM_DESC(wapf, "WAPF value"); | 80 | MODULE_PARM_DESC(wapf, "WAPF value"); |
80 | 81 | ||
81 | static uint wlan_status = 1; | 82 | static int wlan_status = 1; |
82 | static uint bluetooth_status = 1; | 83 | static int bluetooth_status = 1; |
83 | 84 | ||
84 | module_param(wlan_status, uint, 0644); | 85 | module_param(wlan_status, int, 0644); |
85 | MODULE_PARM_DESC(wlan_status, "Set the wireless status on boot " | 86 | MODULE_PARM_DESC(wlan_status, "Set the wireless status on boot " |
86 | "(0 = disabled, 1 = enabled, -1 = don't do anything). " | 87 | "(0 = disabled, 1 = enabled, -1 = don't do anything). " |
87 | "default is 1"); | 88 | "default is 1"); |
88 | 89 | ||
89 | module_param(bluetooth_status, uint, 0644); | 90 | module_param(bluetooth_status, int, 0644); |
90 | MODULE_PARM_DESC(bluetooth_status, "Set the wireless status on boot " | 91 | MODULE_PARM_DESC(bluetooth_status, "Set the wireless status on boot " |
91 | "(0 = disabled, 1 = enabled, -1 = don't do anything). " | 92 | "(0 = disabled, 1 = enabled, -1 = don't do anything). " |
92 | "default is 1"); | 93 | "default is 1"); |