diff options
| author | Xinyu Chen <b03824@freescale.com> | 2011-12-06 17:19:12 +0800 |
|---|---|---|
| committer | Xinyu Chen <b03824@freescale.com> | 2011-12-06 17:19:12 +0800 |
| commit | 4eb99c5e5be396410fa62178e94b8fca62abf7d5 (patch) | |
| tree | 17670f1e0ffb20a1aaa48a72a7312c1ee4a036cb /include | |
| parent | 73c089abb36b98866bbfbaec0f9a2dafbfe73ed5 (diff) | |
| parent | b92265a274f0fec27567e86b995424ef8823499f (diff) | |
Merge remote branch 'fsl-linux-sdk/imx_2.6.38' into imx_2.6.38_android
Conflicts:
arch/arm/mach-mx6/system.c
drivers/media/video/mxc/capture/mxc_v4l2_capture.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fsl_devices.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index cb2bcc1a47c0..cc1d8574dc7f 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h @@ -119,6 +119,7 @@ struct fsl_usb2_platform_data { enum usb_wakeup_event (*is_wakeup_event)(struct fsl_usb2_platform_data *); void (*wakeup_handler)(struct fsl_usb2_platform_data *); void (*hsic_post_ops)(void); + void (*gadget_discharge_dp) (bool); struct fsl_usb2_wakeup_platform_data *wakeup_pdata; struct platform_device *pdev; @@ -253,6 +254,7 @@ struct fsl_mxc_camera_platform_data { u32 mclk; u32 csi; void (*pwdn)(int pwdn); + void (*io_init)(void); }; struct mpc8xx_pcmcia_ops { @@ -363,6 +365,8 @@ struct mxs_perfmon_bit_config { struct mxs_platform_perfmon_data { struct mxs_perfmon_bit_config *bit_config_tab; int bit_config_cnt; + void (*plt_init) (void); + void (*plt_exit) (void); }; #endif /* _FSL_DEVICE_H_ */ |