diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/arm/mach-pxa/lubbock.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/arm/mach-pxa/lubbock.c')
| -rw-r--r-- | arch/arm/mach-pxa/lubbock.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c index c6a94d3fdd6..98ee7e59029 100644 --- a/arch/arm/mach-pxa/lubbock.c +++ b/arch/arm/mach-pxa/lubbock.c | |||
| @@ -518,6 +518,10 @@ static void __init lubbock_init(void) | |||
| 518 | 518 | ||
| 519 | pxa2xx_mfp_config(ARRAY_AND_SIZE(lubbock_pin_config)); | 519 | pxa2xx_mfp_config(ARRAY_AND_SIZE(lubbock_pin_config)); |
| 520 | 520 | ||
| 521 | pxa_set_ffuart_info(NULL); | ||
| 522 | pxa_set_btuart_info(NULL); | ||
| 523 | pxa_set_stuart_info(NULL); | ||
| 524 | |||
| 521 | clk_add_alias("SA1111_CLK", NULL, "GPIO11_CLK", NULL); | 525 | clk_add_alias("SA1111_CLK", NULL, "GPIO11_CLK", NULL); |
| 522 | pxa_set_udc_info(&udc_info); | 526 | pxa_set_udc_info(&udc_info); |
| 523 | set_pxa_fb_info(&sharp_lm8v31); | 527 | set_pxa_fb_info(&sharp_lm8v31); |