diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-22 03:22:33 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-22 04:07:21 -0400 |
| commit | e3a66aa33a8f06924f67770e15c22a5c52df314e (patch) | |
| tree | fb8786f1300bdce8f6fc7462e3fd5699e057dd24 /drivers/i2c/busses | |
| parent | be2109e13fc6f017040c57615acfe1065723687b (diff) | |
| parent | 6884b680459ab850f99fc37605084187bc9888ac (diff) | |
Merge branch 'multiplatform/platform-data' into next/multiplatform
* multiplatform/platform-data:
ARM: spear: move platform_data definitions
ARM: samsung: move platform_data definitions
ARM: orion: move platform_data definitions
ARM: nomadik: move platform_data definitions
ARM: w90x900: move platform_data definitions
ARM: vt8500: move platform_data definitions
ARM: tegra: move sdhci platform_data definition
ARM: sa1100: move platform_data definitions
ARM: pxa: move platform_data definitions
ARM: netx: move platform_data definitions
ARM: msm: move platform_data definitions
ARM: imx: move platform_data definitions
ARM: ep93xx: move platform_data definitions
ARM: davinci: move platform_data definitions
ARM: at91: move platform_data definitions
Conflicts due to removed files:
arch/arm/mach-tegra/board-harmony.c
arch/arm/mach-tegra/board-trimslice.c
Conflicts due to code removal:
arch/arm/mach-tegra/board-paz00.c
Context conflicts in:
drivers/mmc/host/sdhci-tegra.c
drivers/net/irda/pxaficp_ir.c
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/i2c/busses')
| -rw-r--r-- | drivers/i2c/busses/i2c-davinci.c | 2 | ||||
| -rw-r--r-- | drivers/i2c/busses/i2c-imx.c | 2 | ||||
| -rw-r--r-- | drivers/i2c/busses/i2c-nuc900.c | 2 | ||||
| -rw-r--r-- | drivers/i2c/busses/i2c-s3c2410.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c index 79b4bcb3b85c..79a2542d8c41 100644 --- a/drivers/i2c/busses/i2c-davinci.c +++ b/drivers/i2c/busses/i2c-davinci.c | |||
| @@ -40,7 +40,7 @@ | |||
| 40 | #include <linux/gpio.h> | 40 | #include <linux/gpio.h> |
| 41 | 41 | ||
| 42 | #include <mach/hardware.h> | 42 | #include <mach/hardware.h> |
| 43 | #include <mach/i2c.h> | 43 | #include <linux/platform_data/i2c-davinci.h> |
| 44 | 44 | ||
| 45 | /* ----- global defines ----------------------------------------------- */ | 45 | /* ----- global defines ----------------------------------------------- */ |
| 46 | 46 | ||
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 0722f869465c..b7907ba7448a 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c | |||
| @@ -54,7 +54,7 @@ | |||
| 54 | #include <linux/pinctrl/consumer.h> | 54 | #include <linux/pinctrl/consumer.h> |
| 55 | 55 | ||
| 56 | #include <mach/hardware.h> | 56 | #include <mach/hardware.h> |
| 57 | #include <mach/i2c.h> | 57 | #include <linux/platform_data/i2c-imx.h> |
| 58 | 58 | ||
| 59 | /** Defines ******************************************************************** | 59 | /** Defines ******************************************************************** |
| 60 | *******************************************************************************/ | 60 | *******************************************************************************/ |
diff --git a/drivers/i2c/busses/i2c-nuc900.c b/drivers/i2c/busses/i2c-nuc900.c index a26dfb8cd586..f41502ef3f55 100644 --- a/drivers/i2c/busses/i2c-nuc900.c +++ b/drivers/i2c/busses/i2c-nuc900.c | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | #include <linux/io.h> | 29 | #include <linux/io.h> |
| 30 | 30 | ||
| 31 | #include <mach/mfp.h> | 31 | #include <mach/mfp.h> |
| 32 | #include <mach/i2c.h> | 32 | #include <linux/platform_data/i2c-nuc900.h> |
| 33 | 33 | ||
| 34 | /* nuc900 i2c registers offset */ | 34 | /* nuc900 i2c registers offset */ |
| 35 | 35 | ||
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 5ae3b0236bd3..4d07dea9bca9 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | #include <asm/irq.h> | 42 | #include <asm/irq.h> |
| 43 | 43 | ||
| 44 | #include <plat/regs-iic.h> | 44 | #include <plat/regs-iic.h> |
| 45 | #include <plat/iic.h> | 45 | #include <linux/platform_data/i2c-s3c2410.h> |
| 46 | 46 | ||
| 47 | /* Treat S3C2410 as baseline hardware, anything else is supported via quirks */ | 47 | /* Treat S3C2410 as baseline hardware, anything else is supported via quirks */ |
| 48 | #define QUIRK_S3C2440 (1 << 0) | 48 | #define QUIRK_S3C2440 (1 << 0) |