summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorSanjay Singh Rawat <srawat@nvidia.com>2012-03-28 17:44:56 +0530
committerRohan Somvanshi <rsomvanshi@nvidia.com>2012-04-19 05:00:13 -0700
commitbdd8ce3b99c4ff20dc2f83698c1dc3ae5780fe30 (patch)
tree3cc970a567b781c7259d7aa85fa6c8405a43401f /include/linux
parent20395e4c50ceea0d114c9beaaa5fa0e18b87915e (diff)
drivers: resolve compilation time warnings
bug 949219 Change-Id: I5942ba86bd1cbe1f1bd06a7c9f51a10d83e6cabb Signed-off-by: Sanjay Singh Rawat <srawat@nvidia.com> Reviewed-on: http://git-master/r/92819 Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com> Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/smb349-charger.h1
-rw-r--r--include/linux/wl12xx.h4
2 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/smb349-charger.h b/include/linux/smb349-charger.h
index 6dbec61034ed..19e7aa6f5e73 100644
--- a/include/linux/smb349-charger.h
+++ b/include/linux/smb349-charger.h
@@ -26,6 +26,7 @@
#include <linux/regulator/machine.h>
#include <linux/platform_device.h>
#include <linux/regulator/driver.h>
+#include <linux/usb/otg.h>
struct smb349_charger_platform_data {
int regulator_id;
diff --git a/include/linux/wl12xx.h b/include/linux/wl12xx.h
index 0f559ae411c8..c13dc0c0f4c3 100644
--- a/include/linux/wl12xx.h
+++ b/include/linux/wl12xx.h
@@ -48,8 +48,8 @@ enum {
};
struct wl12xx_platform_data {
- void (*set_power)(bool enable);
- void (*set_carddetect)(bool enable);
+ int (*set_power)(int power_on);
+ int (*set_carddetect)(int val);
/* SDIO only: IRQ number if WLAN_IRQ line is used, 0 for SDIO IRQs */
int irq;
bool use_eeprom;