Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit a0774f45 authored Mar 21, 2011 by Ben Dooks

Merge branches 'for-2639/i2c/i2c-ce4100-v6', 'for-2639/i2c/i2c-eg20t-v3' and...

Merge branches 'for-2639/i2c/i2c-ce4100-v6', 'for-2639/i2c/i2c-eg20t-v3' and 'for-2639/i2c/i2c-imx' into for-linus/2639/i2c-2

parents e4394d55 23e74a86 173442f2 6b7d815c

arch/arm/mach-mmp/include/mach/mmp2.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,8 +11,8 @@ extern void __init mmp2_init_irq(void);
		extern void mmp2_clear_pmic_int(void);

		#include <linux/i2c.h>
		#include <linux/i2c/pxa-i2c.h>
		#include <mach/devices.h>
		#include <plat/i2c.h>

		extern struct pxa_device_desc mmp2_device_uart1;
		extern struct pxa_device_desc mmp2_device_uart2;

arch/arm/mach-mmp/include/mach/pxa168.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,8 +8,8 @@ extern void __init pxa168_init_irq(void);
		extern void pxa168_clear_keypad_wakeup(void);

		#include <linux/i2c.h>
		#include <linux/i2c/pxa-i2c.h>
		#include <mach/devices.h>
		#include <plat/i2c.h>
		#include <plat/pxa3xx_nand.h>
		#include <video/pxa168fb.h>
		#include <plat/pxa27x_keypad.h>

arch/arm/mach-mmp/include/mach/pxa910.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,8 +7,8 @@ extern struct sys_timer pxa910_timer;
		extern void __init pxa910_init_irq(void);

		#include <linux/i2c.h>
		#include <linux/i2c/pxa-i2c.h>
		#include <mach/devices.h>
		#include <plat/i2c.h>
		#include <plat/pxa3xx_nand.h>

		extern struct pxa_device_desc pxa910_device_uart1;

arch/arm/mach-pxa/balloon3.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@
		#include <linux/mtd/partitions.h>
		#include <linux/types.h>
		#include <linux/i2c/pcf857x.h>
		#include <linux/i2c/pxa-i2c.h>
		#include <linux/mtd/nand.h>
		#include <linux/mtd/physmap.h>
		#include <linux/regulator/max1586.h>
		@@ -51,8 +52,6 @@
		#include <mach/irda.h>
		#include <mach/ohci.h>

		#include <plat/i2c.h>

		#include "generic.h"
		#include "devices.h"

arch/arm/mach-pxa/cm-x300.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@

		#include <linux/i2c.h>
		#include <linux/i2c/pca953x.h>
		#include <linux/i2c/pxa-i2c.h>

		#include <linux/mfd/da903x.h>
		#include <linux/regulator/machine.h>
		@@ -48,7 +49,6 @@
		#include <mach/pxafb.h>
		#include <mach/mmc.h>
		#include <mach/ohci.h>
		#include <plat/i2c.h>
		#include <plat/pxa3xx_nand.h>
		#include <mach/audio.h>
		#include <mach/pxa3xx-u2d.h>