diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-14 18:01:56 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-14 18:01:56 +0100 |
| commit | b89371621e5bedc84498ced2c5c33976bd1b2f64 (patch) | |
| tree | b309919239586e25617a17785b827577b1abb6b5 /arch/arm/mach-pxa/colibri-pxa300.c | |
| parent | 63978ab3e3e963db28093b53bb4598f2702e1ad7 (diff) | |
| parent | 74c2b45b714e49b427584b4bd8f44f1a24d82d9c (diff) | |
| download | linux-b89371621e5bedc84498ced2c5c33976bd1b2f64.tar.gz linux-b89371621e5bedc84498ced2c5c33976bd1b2f64.tar.bz2 linux-b89371621e5bedc84498ced2c5c33976bd1b2f64.zip | |
Merge branch 'next/isa' into topic/misc
Diffstat (limited to 'arch/arm/mach-pxa/colibri-pxa300.c')
| -rw-r--r-- | arch/arm/mach-pxa/colibri-pxa300.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/colibri-pxa300.c b/arch/arm/mach-pxa/colibri-pxa300.c index 37c239c56568..45c23fd6df31 100644 --- a/arch/arm/mach-pxa/colibri-pxa300.c +++ b/arch/arm/mach-pxa/colibri-pxa300.c @@ -170,6 +170,10 @@ static inline void colibri_pxa310_init_ac97(void) {} void __init colibri_pxa300_init(void) { + pxa_set_ffuart_info(NULL); + pxa_set_btuart_info(NULL); + pxa_set_stuart_info(NULL); + colibri_pxa300_init_eth(); colibri_pxa300_init_ohci(); colibri_pxa3xx_init_nand(); |