diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-29 05:46:10 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-29 05:46:10 -0400 |
| commit | e93721a70263afefbac781f575bfe851c6f95d84 (patch) | |
| tree | ab359f12a0688802aa99339bae82c51763dae9f6 /arch/mips/txx9/rbtx4939/setup.c | |
| parent | ae1ec5e1e97f67d41e641a73380129e5905e41cc (diff) | |
| parent | c87d9732004b3f8fd82d729f12ccfb96c0df279e (diff) | |
Merge branch 'fix/pcm-jiffies-check' into topic/pcm-jiffies-check
Diffstat (limited to 'arch/mips/txx9/rbtx4939/setup.c')
| -rw-r--r-- | arch/mips/txx9/rbtx4939/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/txx9/rbtx4939/setup.c b/arch/mips/txx9/rbtx4939/setup.c index 011e1e332f47..4199c6fd4d1d 100644 --- a/arch/mips/txx9/rbtx4939/setup.c +++ b/arch/mips/txx9/rbtx4939/setup.c | |||
| @@ -536,7 +536,7 @@ static void __init rbtx4939_setup(void) | |||
| 536 | } | 536 | } |
| 537 | 537 | ||
| 538 | struct txx9_board_vec rbtx4939_vec __initdata = { | 538 | struct txx9_board_vec rbtx4939_vec __initdata = { |
| 539 | .system = "Tothiba RBTX4939", | 539 | .system = "Toshiba RBTX4939", |
| 540 | .prom_init = rbtx4939_prom_init, | 540 | .prom_init = rbtx4939_prom_init, |
| 541 | .mem_setup = rbtx4939_setup, | 541 | .mem_setup = rbtx4939_setup, |
| 542 | .irq_setup = rbtx4939_irq_setup, | 542 | .irq_setup = rbtx4939_irq_setup, |