aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/spitz.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-10-09 16:31:56 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-09 16:31:56 -0400
commit6a4690c22f5da1eb1c898b61b6a80da52fbd976f (patch)
treea03891a32abe0da191fb765fe669a597e07423c6 /arch/arm/mach-pxa/spitz.c
parent90bb28b0644f7324f8bd1feb27b35146e6785ba2 (diff)
parent8ec53663d2698076468b3e1edc4e1b418bd54de3 (diff)
Merge branch 'ptebits' into devel
Conflicts: arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-pxa/spitz.c')
-rw-r--r--arch/arm/mach-pxa/spitz.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index 73a2da0065f5..7e181afcca39 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -40,6 +40,7 @@
40#include <mach/pxa2xx-gpio.h> 40#include <mach/pxa2xx-gpio.h>
41#include <mach/pxa27x-udc.h> 41#include <mach/pxa27x-udc.h>
42#include <mach/reset.h> 42#include <mach/reset.h>
43#include <mach/i2c.h>
43#include <mach/irda.h> 44#include <mach/irda.h>
44#include <mach/mmc.h> 45#include <mach/mmc.h>
45#include <mach/ohci.h> 46#include <mach/ohci.h>
@@ -574,6 +575,7 @@ static void __init common_init(void)
574 pxa_set_ficp_info(&spitz_ficp_platform_data); 575 pxa_set_ficp_info(&spitz_ficp_platform_data);
575 set_pxa_fb_parent(&spitzssp_device.dev); 576 set_pxa_fb_parent(&spitzssp_device.dev);
576 set_pxa_fb_info(&spitz_pxafb_info); 577 set_pxa_fb_info(&spitz_pxafb_info);
578 pxa_set_i2c_info(NULL);
577} 579}
578 580
579#if defined(CONFIG_MACH_SPITZ) || defined(CONFIG_MACH_BORZOI) 581#if defined(CONFIG_MACH_SPITZ) || defined(CONFIG_MACH_BORZOI)