diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2025-06-23 13:14:13 -0400 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2025-06-23 13:14:13 -0400 |
| commit | 0089d6ee3bb6d961f6e193d9384705ed41496adf (patch) | |
| tree | 17f9ac6a72f075501f7837b55a413471c5aa508f /include/linux/platform_data/video-pxafb.h | |
| parent | 3972872e459d812ab5e481a231a6066cf4f4d0f4 (diff) | |
| parent | 36c52fb703e90388285963fc8f03cf60f76cbe4c (diff) | |
| download | linux-next-0089d6ee3bb6d961f6e193d9384705ed41496adf.tar.gz linux-next-0089d6ee3bb6d961f6e193d9384705ed41496adf.zip | |
Merge drm/drm-next into drm-xe-next
Catch up on i915 changes to be able to include mtd
driver for both xe and i915.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'include/linux/platform_data/video-pxafb.h')
| -rw-r--r-- | include/linux/platform_data/video-pxafb.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/platform_data/video-pxafb.h b/include/linux/platform_data/video-pxafb.h index 6333bac166a5..38c24c77ba43 100644 --- a/include/linux/platform_data/video-pxafb.h +++ b/include/linux/platform_data/video-pxafb.h @@ -150,7 +150,6 @@ struct pxafb_mach_info { }; void pxa_set_fb_info(struct device *, struct pxafb_mach_info *); -unsigned long pxafb_get_hsync_time(struct device *dev); /* smartpanel related */ #define SMART_CMD_A0 (0x1 << 8) |