diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2011-12-13 16:40:18 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2011-12-13 16:40:18 +0800 |
| commit | 18e894b2240b58718d665329ca5d2c0681feb901 (patch) | |
| tree | cde13eb1f88f47b31fe1f101a25027ec1eef73f5 /include | |
| parent | c5d492b9a9539992d8cc040a8a675d0e445c0d0d (diff) | |
| parent | bdcbf429b11f93bd0df305f9c04c09616009fc3d (diff) | |
Merge remote-tracking branch 'fsl-linux-sdk/imx_2.6.38' into imx_2.6.38_android
Conflicts:
arch/arm/mach-mx6/board-mx6q_arm2.c
arch/arm/mach-mx6/board-mx6q_sabrelite.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fb.h | 2 | ||||
| -rw-r--r-- | include/linux/fsl_devices.h | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index 030312c6adf0..68ba85a00c06 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -547,8 +547,6 @@ struct fb_cursor_user { #define FB_EVENT_FB_UNBIND 0x0E /* CONSOLE-SPECIFIC: remap all consoles to new fb - for vga switcheroo */ #define FB_EVENT_REMAP_ALL_CONSOLE 0x0F -/* PRE MODE CHANGE added by fsl */ -#define FB_EVENT_PREMODE_CHANGE 0x10 struct fb_event { struct fb_info *info; diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index cc1d8574dc7f..60812da073b8 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h @@ -119,7 +119,6 @@ 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; |