[Meego-kernel] [PATCH] usb: intel-mid-otg: fix compiling error with CONFIG_PM not set.
Hao Wu
hao.wu at intel.com
Thu Dec 16 21:44:50 PST 2010
This patch fixed a compiling error when CONFIG_PM is not set.
Remove uneccessary ifdef in data structures definition to keep
members available all the time.
Signed-off-by: Hao Wu <hao.wu at intel.com>
---
include/linux/usb/intel_mid_otg.h | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/include/linux/usb/intel_mid_otg.h b/include/linux/usb/intel_mid_otg.h
index 62db841..5555536 100644
--- a/include/linux/usb/intel_mid_otg.h
+++ b/include/linux/usb/intel_mid_otg.h
@@ -134,7 +134,6 @@ struct intel_mid_otg_xceiv {
int (*set_adp_sense)(struct intel_mid_otg_xceiv *iotg,
bool enabled);
-#ifdef CONFIG_PM
/* suspend/resume USB host function */
int (*suspend_host)(struct intel_mid_otg_xceiv *iotg,
pm_message_t message);
@@ -149,10 +148,8 @@ struct intel_mid_otg_xceiv {
int (*runtime_resume_host)(struct intel_mid_otg_xceiv *iotg);
int (*runtime_suspend_peripheral)(struct intel_mid_otg_xceiv *iotg);
int (*runtime_resume_peripheral)(struct intel_mid_otg_xceiv *iotg);
-
-#endif
-
};
+
static inline
struct intel_mid_otg_xceiv *otg_to_mid_xceiv(struct otg_transceiver *otg)
{
--
1.6.0.6
More information about the MeeGo-kernel
mailing list