diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-01-13 02:37:24 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-01-13 02:37:24 -0500 |
| commit | 6db9a0f326d3144d790d9479309df480a8f562e4 (patch) | |
| tree | 650a8950c35c087278ecee1b8d123f75f601ebc8 /arch/arm/mach-kirkwood | |
| parent | c400c9e23feb5bb3fbe8a8d4581ecce3b19a2f38 (diff) | |
| parent | 18b022eb117e7f70c191267551ff865f278a9258 (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'arch/arm/mach-kirkwood')
| -rw-r--r-- | arch/arm/mach-kirkwood/openrd-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c index c9d77fad10ab..cfcca4174e25 100644 --- a/arch/arm/mach-kirkwood/openrd-setup.c +++ b/arch/arm/mach-kirkwood/openrd-setup.c | |||
| @@ -171,7 +171,7 @@ static void __init openrd_init(void) | |||
| 171 | 171 | ||
| 172 | kirkwood_i2c_init(); | 172 | kirkwood_i2c_init(); |
| 173 | 173 | ||
| 174 | if (machine_is_openrd_client()) { | 174 | if (machine_is_openrd_client() || machine_is_openrd_ultimate()) { |
| 175 | i2c_register_board_info(0, i2c_board_info, | 175 | i2c_register_board_info(0, i2c_board_info, |
| 176 | ARRAY_SIZE(i2c_board_info)); | 176 | ARRAY_SIZE(i2c_board_info)); |
| 177 | kirkwood_audio_init(); | 177 | kirkwood_audio_init(); |