diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 16:31:56 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 16:31:56 -0400 |
| commit | 6a4690c22f5da1eb1c898b61b6a80da52fbd976f (patch) | |
| tree | a03891a32abe0da191fb765fe669a597e07423c6 /arch/arm/mach-pxa/corgi.c | |
| parent | 90bb28b0644f7324f8bd1feb27b35146e6785ba2 (diff) | |
| parent | 8ec53663d2698076468b3e1edc4e1b418bd54de3 (diff) | |
Merge branch 'ptebits' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mach-pxa/corgi.c')
| -rw-r--r-- | arch/arm/mach-pxa/corgi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c index fe5f1ba6c34b..4cbf08bd546b 100644 --- a/arch/arm/mach-pxa/corgi.c +++ b/arch/arm/mach-pxa/corgi.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | #include <mach/pxa-regs.h> | 38 | #include <mach/pxa-regs.h> |
| 39 | #include <mach/pxa2xx-regs.h> | 39 | #include <mach/pxa2xx-regs.h> |
| 40 | #include <mach/pxa2xx-gpio.h> | 40 | #include <mach/pxa2xx-gpio.h> |
| 41 | #include <mach/i2c.h> | ||
| 41 | #include <mach/irda.h> | 42 | #include <mach/irda.h> |
| 42 | #include <mach/mmc.h> | 43 | #include <mach/mmc.h> |
| 43 | #include <mach/udc.h> | 44 | #include <mach/udc.h> |
| @@ -532,6 +533,7 @@ static void __init corgi_init(void) | |||
| 532 | pxa_set_udc_info(&udc_info); | 533 | pxa_set_udc_info(&udc_info); |
| 533 | pxa_set_mci_info(&corgi_mci_platform_data); | 534 | pxa_set_mci_info(&corgi_mci_platform_data); |
| 534 | pxa_set_ficp_info(&corgi_ficp_platform_data); | 535 | pxa_set_ficp_info(&corgi_ficp_platform_data); |
| 536 | pxa_set_i2c_info(NULL); | ||
| 535 | 537 | ||
| 536 | platform_scoop_config = &corgi_pcmcia_config; | 538 | platform_scoop_config = &corgi_pcmcia_config; |
| 537 | 539 | ||