From: Jan Glauber <jglauber at cavium.com> Sort include files alphabetically to reduce probability of merge conflicts. Signed-off-by: Jan Glauber <jglauber at cavium.com> Signed-off-by: Wolfram Sang <wsa at the-dreams.de> (cherry picked from commit caa505f20df01b326ca99dcace0c4656298d94f3) Signed-off-by: Vadim Lomovtsev <Vadim.Lomovtsev at caviumnetworks.com> --- drivers/i2c/busses/i2c-octeon-platdrv.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-octeon-platdrv.c b/drivers/i2c/busses/i2c-octeon-platdrv.c index 916ebee..ce2765f 100644 --- a/drivers/i2c/busses/i2c-octeon-platdrv.c +++ b/drivers/i2c/busses/i2c-octeon-platdrv.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-octeon-core.h" -- 2.5.5