diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2013-09-04 21:18:07 +0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2013-09-04 21:18:07 +0400 |
| commit | 4d854194f3e60d56d68e82a934d5613c42c1273b (patch) | |
| tree | 685c39d2c4452f9208240833b13c25e97c2a2c1f /arch/mips/txx9/generic | |
| parent | 12d14e0edd4ea7b5fd879e55855969771d37aad8 (diff) | |
| parent | f7c1285f0eba8e0910decc0fa5b409f886e4358e (diff) | |
| download | linux-4d854194f3e60d56d68e82a934d5613c42c1273b.tar.xz | |
Merge branch '3.11-fixes' into mips-for-linux-next
Diffstat (limited to 'arch/mips/txx9/generic')
| -rw-r--r-- | arch/mips/txx9/generic/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c index 681e7f86c080..2b0b83c171e0 100644 --- a/arch/mips/txx9/generic/setup.c +++ b/arch/mips/txx9/generic/setup.c @@ -350,7 +350,7 @@ static void __init select_board(void) } /* select "default" board */ -#ifdef CONFIG_CPU_TX39XX +#ifdef CONFIG_TOSHIBA_JMR3927 txx9_board_vec = &jmr3927_vec; #endif #ifdef CONFIG_CPU_TX49XX |