diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-14 21:37:05 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-14 21:37:05 -0400 |
| commit | 0d1d392f011b284bb4af0411b2d36e5d04e0f058 (patch) | |
| tree | 081f99182bde3cc8af49b80b4e9df7d95476e8ed /arch/mips/bcm63xx/setup.c | |
| parent | fa180eb448fa263cf18dd930143b515d27d70d7b (diff) | |
| parent | 41ef2d5678d83af030125550329b6ae8b74618fa (diff) | |
Merge 3.9-rc7 into driver-core-next
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/mips/bcm63xx/setup.c')
| -rw-r--r-- | arch/mips/bcm63xx/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/bcm63xx/setup.c b/arch/mips/bcm63xx/setup.c index 314231be788c..35e18e98beb9 100644 --- a/arch/mips/bcm63xx/setup.c +++ b/arch/mips/bcm63xx/setup.c | |||
| @@ -157,4 +157,4 @@ int __init bcm63xx_register_devices(void) | |||
| 157 | return board_register_devices(); | 157 | return board_register_devices(); |
| 158 | } | 158 | } |
| 159 | 159 | ||
| 160 | device_initcall(bcm63xx_register_devices); | 160 | arch_initcall(bcm63xx_register_devices); |