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
/
saarb.c
diff --git
a/arch/arm/mach-pxa/saarb.c
b/arch/arm/mach-pxa/saarb.c
index
e497922
..
9322fe5
100644
(file)
--- a/
arch/arm/mach-pxa/saarb.c
+++ b/
arch/arm/mach-pxa/saarb.c
@@
-13,6
+13,7
@@
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/i2c.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/i2c.h>
+#include <linux/i2c/pxa-i2c.h>
#include <linux/mfd/88pm860x.h>
#include <asm/mach-types.h>
#include <linux/mfd/88pm860x.h>
#include <asm/mach-types.h>
@@
-24,8
+25,6
@@
#include <mach/mfp-pxa930.h>
#include <mach/gpio.h>
#include <mach/mfp-pxa930.h>
#include <mach/gpio.h>
-#include <plat/i2c.h>
-
#include "generic.h"
#define SAARB_NR_IRQS (IRQ_BOARD_START + 40)
#include "generic.h"
#define SAARB_NR_IRQS (IRQ_BOARD_START + 40)