git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
devices.c
diff --git
a/arch/arm/mach-pxa/devices.c
b/arch/arm/mach-pxa/devices.c
index
4c766e3
..
c4bf08b
100644
(file)
--- a/
arch/arm/mach-pxa/devices.c
+++ b/
arch/arm/mach-pxa/devices.c
@@
-4,6
+4,7
@@
#include <linux/platform_device.h>
#include <linux/dma-mapping.h>
#include <linux/spi/pxa2xx_spi.h>
#include <linux/platform_device.h>
#include <linux/dma-mapping.h>
#include <linux/spi/pxa2xx_spi.h>
+#include <linux/i2c/pxa-i2c.h>
#include <asm/pmu.h>
#include <mach/udc.h>
#include <asm/pmu.h>
#include <mach/udc.h>
@@
-16,7
+17,6
@@
#include <mach/camera.h>
#include <mach/audio.h>
#include <mach/hardware.h>
#include <mach/camera.h>
#include <mach/audio.h>
#include <mach/hardware.h>
-#include <plat/i2c.h>
#include <plat/pxa3xx_nand.h>
#include "devices.h"
#include <plat/pxa3xx_nand.h>
#include "devices.h"