Message ID | a3cdb6c57ba36c79f3e09e5bd0deca8864a9e4d4.1465997604.git.jglauber@cavium.com |
---|---|
State | Superseded |
Headers | show |
diff --git a/drivers/i2c/busses/i2c-octeon-core.c b/drivers/i2c/busses/i2c-octeon-core.c index 038007d..ce535fa 100644 --- a/drivers/i2c/busses/i2c-octeon-core.c +++ b/drivers/i2c/busses/i2c-octeon-core.c @@ -12,16 +12,16 @@ */ #include <linux/atomic.h> -#include <linux/platform_device.h> +#include <linux/delay.h> +#include <linux/i2c.h> #include <linux/interrupt.h> +#include <linux/io.h> #include <linux/kernel.h> #include <linux/module.h> -#include <linux/delay.h> +#include <linux/of.h> +#include <linux/platform_device.h> #include <linux/sched.h> #include <linux/slab.h> -#include <linux/i2c.h> -#include <linux/io.h> -#include <linux/of.h> #include <asm/octeon/octeon.h> #include "i2c-cavium.h"
Sort include files alphabetically to reduce probability of merge conflicts. Signed-off-by: Jan Glauber <jglauber@cavium.com> --- drivers/i2c/busses/i2c-octeon-core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)