diff options
| author |   Patrick McHardy <kaber@trash.net> | 2011-01-19 23:51:37 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-01-19 23:51:37 +0100 |
| commit | 14f0290ba44de6ed435fea24bba26e7868421c66 (patch) | |
| tree | 449d32e4848007e3edbcab14fa8e09fdc66608ed /arch/sh/boards/board-edosk7760.c | |
| parent | netfilter: nf_conntrack: fix lifetime display for disabled connections (diff) | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-dev-14f0290ba44de6ed435fea24bba26e7868421c66.tar.xz linux-dev-14f0290ba44de6ed435fea24bba26e7868421c66.zip | |
Merge branch 'master' of /repos/git/net-next-2.6
Diffstat (limited to 'arch/sh/boards/board-edosk7760.c')
| -rw-r--r-- | arch/sh/boards/board-edosk7760.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boards/board-edosk7760.c b/arch/sh/boards/board-edosk7760.c index 35dc0994875d..f47ac82da876 100644 --- a/arch/sh/boards/board-edosk7760.c +++ b/arch/sh/boards/board-edosk7760.c @@ -182,7 +182,7 @@ static int __init init_edosk7760_devices(void) return platform_add_devices(edosk7760_devices, ARRAY_SIZE(edosk7760_devices)); } -__initcall(init_edosk7760_devices); +device_initcall(init_edosk7760_devices); /* * The Machine Vector |