diff options
author | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-12-05 05:02:33 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-12-05 05:04:49 -0500 |
commit | b6973637c4cc842c1aa7d6c848781b4bdeb4415b (patch) | |
tree | eadc53d2b0ab792339cff7ea7bbb4e2921a4a76e /drivers/media/pci | |
parent | 12645e0655e457ae6727da4fae100e88ee78f42f (diff) | |
download | linux-stable-b6973637c4cc842c1aa7d6c848781b4bdeb4415b.tar.gz linux-stable-b6973637c4cc842c1aa7d6c848781b4bdeb4415b.tar.bz2 linux-stable-b6973637c4cc842c1aa7d6c848781b4bdeb4415b.zip |
media: ddbridge: remove another duplicate of io.h and sort includes
The io.h was still included twice. Having a large number of
includes like that unsorted is likely the reason why we ended
by having 3 includes of io.h and two includes of interrupt.h
at the first place.
So, let's reorder the includes on alphabetic order. That would
make easier to maintain it.
Fixes: 12645e0655e4 ("media: ddbridge: remove some duplicated include file")
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/pci')
-rw-r--r-- | drivers/media/pci/ddbridge/ddbridge.h | 52 |
1 files changed, 25 insertions, 27 deletions
diff --git a/drivers/media/pci/ddbridge/ddbridge.h b/drivers/media/pci/ddbridge/ddbridge.h index 27b46fe704cd..0be6ed216e65 100644 --- a/drivers/media/pci/ddbridge/ddbridge.h +++ b/drivers/media/pci/ddbridge/ddbridge.h @@ -18,45 +18,43 @@ #ifndef _DDBRIDGE_H_ #define _DDBRIDGE_H_ -#include <linux/module.h> -#include <linux/init.h> +#include <asm/dma.h> +#include <asm/irq.h> + +#include <linux/clk.h> +#include <linux/completion.h> #include <linux/delay.h> -#include <linux/slab.h> -#include <linux/poll.h> -#include <linux/pci.h> -#include <linux/timer.h> +#include <linux/device.h> +#include <linux/dvb/ca.h> +#include <linux/gpio.h> #include <linux/i2c.h> -#include <linux/swab.h> -#include <linux/vmalloc.h> -#include <linux/workqueue.h> +#include <linux/init.h> +#include <linux/interrupt.h> +#include <linux/io.h> #include <linux/kthread.h> +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/pci.h> #include <linux/platform_device.h> -#include <linux/clk.h> +#include <linux/poll.h> +#include <linux/sched.h> +#include <linux/slab.h> +#include <linux/socket.h> #include <linux/spi/spi.h> -#include <linux/gpio.h> -#include <linux/completion.h> - +#include <linux/swab.h> +#include <linux/timer.h> #include <linux/types.h> -#include <linux/sched.h> -#include <linux/interrupt.h> -#include <linux/mutex.h> -#include <asm/dma.h> -#include <asm/irq.h> -#include <linux/io.h> #include <linux/uaccess.h> - -#include <linux/dvb/ca.h> -#include <linux/socket.h> -#include <linux/device.h> -#include <linux/io.h> +#include <linux/vmalloc.h> +#include <linux/workqueue.h> #include <media/dmxdev.h> -#include <media/dvbdev.h> +#include <media/dvb_ca_en50221.h> #include <media/dvb_demux.h> +#include <media/dvbdev.h> #include <media/dvb_frontend.h> -#include <media/dvb_ringbuffer.h> -#include <media/dvb_ca_en50221.h> #include <media/dvb_net.h> +#include <media/dvb_ringbuffer.h> #define DDBRIDGE_VERSION "0.9.33-integrated" |