807366af38
This patch has been backported to stable kernel 5.4 already. Remove our local patch explicitly now, as by applying the patch (or refreshing) the relevant code is actually added a second time. Refresh remaining patches as well. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
53 lines
1.5 KiB
Diff
53 lines
1.5 KiB
Diff
From: Russell King <rmk+kernel@armlinux.org.uk>
|
|
Bcc: linux@mail.armlinux.org.uk
|
|
Cc: linux-i2c@vger.kernel.org
|
|
Subject: [PATCH 03/17] i2c: pxa: re-arrange includes to be in alphabetical
|
|
order
|
|
MIME-Version: 1.0
|
|
Content-Disposition: inline
|
|
Content-Transfer-Encoding: 8bit
|
|
Content-Type: text/plain; charset="utf-8"
|
|
|
|
Arrange the includes to be in alphabetical order to help avoid
|
|
duplicated includes.
|
|
|
|
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
|
---
|
|
drivers/i2c/busses/i2c-pxa.c | 18 +++++++++---------
|
|
1 file changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
--- a/drivers/i2c/busses/i2c-pxa.c
|
|
+++ b/drivers/i2c/busses/i2c-pxa.c
|
|
@@ -16,22 +16,22 @@
|
|
* Dec 2004: Added support for PXA27x and slave device probing [Liam Girdwood]
|
|
* Feb 2005: Rework slave mode handling [RMK]
|
|
*/
|
|
-#include <linux/kernel.h>
|
|
-#include <linux/module.h>
|
|
-#include <linux/i2c.h>
|
|
-#include <linux/init.h>
|
|
+#include <linux/clk.h>
|
|
#include <linux/delay.h>
|
|
+#include <linux/err.h>
|
|
#include <linux/errno.h>
|
|
-#include <linux/interrupt.h>
|
|
+#include <linux/i2c.h>
|
|
#include <linux/i2c-pxa.h>
|
|
+#include <linux/init.h>
|
|
+#include <linux/interrupt.h>
|
|
+#include <linux/io.h>
|
|
+#include <linux/kernel.h>
|
|
+#include <linux/module.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_device.h>
|
|
#include <linux/platform_device.h>
|
|
-#include <linux/err.h>
|
|
-#include <linux/clk.h>
|
|
-#include <linux/slab.h>
|
|
-#include <linux/io.h>
|
|
#include <linux/platform_data/i2c-pxa.h>
|
|
+#include <linux/slab.h>
|
|
|
|
struct pxa_reg_layout {
|
|
u32 ibmr;
|