Message ID | 9410b284ec97453fa692537dffaaa4fb4833347c.1508231063.git-series.maxime.ripard@free-electrons.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Tue, Oct 17, 2017 at 05:14:47PM +0800, Chen-Yu Tsai wrote: > On Tue, Oct 17, 2017 at 5:06 PM, Maxime Ripard > <maxime.ripard@free-electrons.com> wrote: > > Some options were not padded as they should, and the order in the Makefile > > was chaotic. Fix that. > > > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > --- > > drivers/gpu/drm/sun4i/Makefile | 28 ++++++++++++++-------------- > > 1 file changed, 14 insertions(+), 14 deletions(-) > > > > diff --git a/drivers/gpu/drm/sun4i/Makefile b/drivers/gpu/drm/sun4i/Makefile > > index 43c753cafc88..af18b70ba5ed 100644 > > --- a/drivers/gpu/drm/sun4i/Makefile > > +++ b/drivers/gpu/drm/sun4i/Makefile > > @@ -1,24 +1,24 @@ > > -sun4i-drm-y += sun4i_drv.o > > -sun4i-drm-y += sun4i_framebuffer.o > > +sun4i-backend-y += sun4i_backend.o sun4i_layer.o > > > > -sun4i-drm-hdmi-y += sun4i_hdmi_enc.o > > -sun4i-drm-hdmi-y += sun4i_hdmi_i2c.o > > -sun4i-drm-hdmi-y += sun4i_hdmi_ddc_clk.o > > -sun4i-drm-hdmi-y += sun4i_hdmi_tmds_clk.o > > +sun4i-drm-y += sun4i_drv.o > > +sun4i-drm-y += sun4i_framebuffer.o > > > > -sun4i-tcon-y += sun4i_tcon.o > > -sun4i-tcon-y += sun4i_rgb.o > > -sun4i-tcon-y += sun4i_dotclock.o > > -sun4i-tcon-y += sun4i_crtc.o > > +sun4i-drm-hdmi-y += sun4i_hdmi_enc.o > > +sun4i-drm-hdmi-y += sun4i_hdmi_i2c.o > > +sun4i-drm-hdmi-y += sun4i_hdmi_ddc_clk.o > > +sun4i-drm-hdmi-y += sun4i_hdmi_tmds_clk.o > > > > -sun4i-backend-y += sun4i_backend.o sun4i_layer.o > > +sun4i-tcon-y += sun4i_tcon.o > > +sun4i-tcon-y += sun4i_rgb.o > > +sun4i-tcon-y += sun4i_dotclock.o > > +sun4i-tcon-y += sun4i_crtc.o > > I don't know if you wanted to sort the file names as well. > This would be a good time to do it. Fixed while applying, thanks! Maxime
diff --git a/drivers/gpu/drm/sun4i/Makefile b/drivers/gpu/drm/sun4i/Makefile index 43c753cafc88..af18b70ba5ed 100644 --- a/drivers/gpu/drm/sun4i/Makefile +++ b/drivers/gpu/drm/sun4i/Makefile @@ -1,24 +1,24 @@ -sun4i-drm-y += sun4i_drv.o -sun4i-drm-y += sun4i_framebuffer.o +sun4i-backend-y += sun4i_backend.o sun4i_layer.o -sun4i-drm-hdmi-y += sun4i_hdmi_enc.o -sun4i-drm-hdmi-y += sun4i_hdmi_i2c.o -sun4i-drm-hdmi-y += sun4i_hdmi_ddc_clk.o -sun4i-drm-hdmi-y += sun4i_hdmi_tmds_clk.o +sun4i-drm-y += sun4i_drv.o +sun4i-drm-y += sun4i_framebuffer.o -sun4i-tcon-y += sun4i_tcon.o -sun4i-tcon-y += sun4i_rgb.o -sun4i-tcon-y += sun4i_dotclock.o -sun4i-tcon-y += sun4i_crtc.o +sun4i-drm-hdmi-y += sun4i_hdmi_enc.o +sun4i-drm-hdmi-y += sun4i_hdmi_i2c.o +sun4i-drm-hdmi-y += sun4i_hdmi_ddc_clk.o +sun4i-drm-hdmi-y += sun4i_hdmi_tmds_clk.o -sun4i-backend-y += sun4i_backend.o sun4i_layer.o +sun4i-tcon-y += sun4i_tcon.o +sun4i-tcon-y += sun4i_rgb.o +sun4i-tcon-y += sun4i_dotclock.o +sun4i-tcon-y += sun4i_crtc.o -sun8i-mixer-y += sun8i_mixer.o sun8i_layer.o +sun8i-mixer-y += sun8i_mixer.o sun8i_layer.o obj-$(CONFIG_DRM_SUN4I) += sun4i-drm.o sun4i-tcon.o obj-$(CONFIG_DRM_SUN4I) += sun6i_drc.o obj-$(CONFIG_DRM_SUN4I) += sun4i_tv.o -obj-$(CONFIG_DRM_SUN4I_BACKEND) += sun4i-backend.o +obj-$(CONFIG_DRM_SUN4I_BACKEND) += sun4i-backend.o obj-$(CONFIG_DRM_SUN4I_HDMI) += sun4i-drm-hdmi.o -obj-$(CONFIG_DRM_SUN8I_MIXER) += sun8i-mixer.o +obj-$(CONFIG_DRM_SUN8I_MIXER) += sun8i-mixer.o
Some options were not padded as they should, and the order in the Makefile was chaotic. Fix that. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- drivers/gpu/drm/sun4i/Makefile | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)