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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
saar.c
diff --git
a/arch/arm/mach-pxa/saar.c
b/arch/arm/mach-pxa/saar.c
index
c1ca8cb
..
eb83c89
100644
(file)
--- a/
arch/arm/mach-pxa/saar.c
+++ b/
arch/arm/mach-pxa/saar.c
@@
-20,6
+20,7
@@
#include <linux/delay.h>
#include <linux/fb.h>
#include <linux/i2c.h>
#include <linux/delay.h>
#include <linux/fb.h>
#include <linux/i2c.h>
+#include <linux/i2c/pxa-i2c.h>
#include <linux/smc91x.h>
#include <linux/mfd/da903x.h>
#include <linux/mtd/mtd.h>
#include <linux/smc91x.h>
#include <linux/mfd/da903x.h>
#include <linux/mtd/mtd.h>
@@
-31,7
+32,6
@@
#include <asm/mach/flash.h>
#include <mach/pxa930.h>
#include <asm/mach/flash.h>
#include <mach/pxa930.h>
-#include <plat/i2c.h>
#include <mach/pxafb.h>
#include "devices.h"
#include <mach/pxafb.h>
#include "devices.h"