git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'ptebits' into devel
[safe/jmp/linux-2.6]
/
arch
/
arm
/
mach-pxa
/
corgi.c
diff --git
a/arch/arm/mach-pxa/corgi.c
b/arch/arm/mach-pxa/corgi.c
index
fe5f1ba
..
4cbf08b
100644
(file)
--- a/
arch/arm/mach-pxa/corgi.c
+++ b/
arch/arm/mach-pxa/corgi.c
@@
-38,6
+38,7
@@
#include <mach/pxa-regs.h>
#include <mach/pxa2xx-regs.h>
#include <mach/pxa2xx-gpio.h>
#include <mach/pxa-regs.h>
#include <mach/pxa2xx-regs.h>
#include <mach/pxa2xx-gpio.h>
+#include <mach/i2c.h>
#include <mach/irda.h>
#include <mach/mmc.h>
#include <mach/udc.h>
#include <mach/irda.h>
#include <mach/mmc.h>
#include <mach/udc.h>
@@
-532,6
+533,7
@@
static void __init corgi_init(void)
pxa_set_udc_info(&udc_info);
pxa_set_mci_info(&corgi_mci_platform_data);
pxa_set_ficp_info(&corgi_ficp_platform_data);
pxa_set_udc_info(&udc_info);
pxa_set_mci_info(&corgi_mci_platform_data);
pxa_set_ficp_info(&corgi_ficp_platform_data);
+ pxa_set_i2c_info(NULL);
platform_scoop_config = &corgi_pcmcia_config;
platform_scoop_config = &corgi_pcmcia_config;