Entries at Makefiles end being merged on random order. Sort them on alphabetical order. I'm preparing similar changes for Kconfig entries too. Suggested-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> Mauro Carvalho Chehab (5): media: xc2028: rename the driver from tuner-xc2028 media: platform: Makefile: group some Makefile options media: Makefiles: remove extra spaces media: dvb-frontend: remove TUNER_ from some DVB frontend Kconfig options media: Makefiles: sort entries where it fits .../admin-guide/media/i2c-cardlist.rst | 2 +- MAINTAINERS | 2 +- drivers/media/Makefile | 4 +- drivers/media/cec/platform/Makefile | 16 +- drivers/media/common/Makefile | 4 +- drivers/media/common/b2c2/Kconfig | 4 +- drivers/media/common/videobuf2/Makefile | 6 +- drivers/media/dvb-frontends/Kconfig | 8 +- drivers/media/dvb-frontends/Makefile | 192 +++++++++--------- drivers/media/dvb-frontends/cx24113.h | 2 +- drivers/media/dvb-frontends/dib0070.h | 2 +- drivers/media/dvb-frontends/dib0090.h | 2 +- drivers/media/dvb-frontends/itd1000.h | 2 +- drivers/media/firewire/Makefile | 2 +- drivers/media/i2c/Makefile | 92 ++++----- drivers/media/pci/Makefile | 18 +- drivers/media/pci/cx18/cx18-driver.c | 2 +- drivers/media/pci/cx18/cx18-dvb.c | 2 +- drivers/media/pci/cx18/cx18-gpio.c | 2 +- drivers/media/pci/cx23885/Kconfig | 2 +- drivers/media/pci/cx23885/cx23885-cards.c | 2 +- drivers/media/pci/cx23885/cx23885-dvb.c | 2 +- drivers/media/pci/cx23885/cx23885-video.c | 2 +- drivers/media/pci/cx88/cx88.h | 2 +- drivers/media/pci/ivtv/ivtv-driver.c | 2 +- drivers/media/pci/ivtv/ivtv-gpio.c | 2 +- drivers/media/pci/saa7134/saa7134-cards.c | 2 +- drivers/media/pci/saa7134/saa7134-dvb.c | 2 +- drivers/media/platform/Makefile | 147 ++++++-------- drivers/media/radio/Makefile | 42 ++-- drivers/media/rc/Makefile | 45 ++-- drivers/media/rc/keymaps/Makefile | 33 +-- drivers/media/spi/Makefile | 5 +- drivers/media/test-drivers/Makefile | 13 +- drivers/media/tuners/Makefile | 66 +++--- drivers/media/tuners/tuner-types.c | 2 +- .../{tuner-xc2028-types.h => xc2028-types.h} | 6 +- .../media/tuners/{tuner-xc2028.c => xc2028.c} | 6 +- .../media/tuners/{tuner-xc2028.h => xc2028.h} | 2 +- drivers/media/tuners/xc4000.c | 2 +- drivers/media/usb/Makefile | 25 +-- drivers/media/usb/dvb-usb/Kconfig | 6 +- drivers/media/usb/dvb-usb/cxusb.c | 2 +- drivers/media/usb/dvb-usb/dib0700_devices.c | 2 +- drivers/media/usb/em28xx/em28xx-i2c.c | 2 +- drivers/media/usb/em28xx/em28xx.h | 2 +- drivers/media/usb/gspca/Makefile | 88 ++++---- drivers/media/usb/tm6000/tm6000-cards.c | 2 +- drivers/media/usb/tm6000/tm6000-dvb.c | 2 +- drivers/media/usb/tm6000/tm6000-i2c.c | 2 +- drivers/media/v4l2-core/Makefile | 29 ++- drivers/media/v4l2-core/tuner-core.c | 2 +- 52 files changed, 450 insertions(+), 465 deletions(-) rename drivers/media/tuners/{tuner-xc2028-types.h => xc2028-types.h} (96%) rename drivers/media/tuners/{tuner-xc2028.c => xc2028.c} (99%) rename drivers/media/tuners/{tuner-xc2028.h => xc2028.h} (99%) -- 2.35.1