diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 08:41:41 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 13:07:53 -0400 |
| commit | 816724e65c72a90a44fbad0ef0b59b186c85fa90 (patch) | |
| tree | 421fa29aedff988e392f92780637553e275d37a0 /drivers/base/init.c | |
| parent | 70ac4385a13f78bc478f26d317511893741b05bd (diff) | |
| parent | d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c
fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
Diffstat (limited to 'drivers/base/init.c')
| -rw-r--r-- | drivers/base/init.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/base/init.c b/drivers/base/init.c index c648914b9cde..37138154f9e8 100644 --- a/drivers/base/init.c +++ b/drivers/base/init.c | |||
| @@ -27,6 +27,7 @@ void __init driver_init(void) | |||
| 27 | buses_init(); | 27 | buses_init(); |
| 28 | classes_init(); | 28 | classes_init(); |
| 29 | firmware_init(); | 29 | firmware_init(); |
| 30 | hypervisor_init(); | ||
| 30 | 31 | ||
| 31 | /* These are also core pieces, but must come after the | 32 | /* These are also core pieces, but must come after the |
| 32 | * core core pieces. | 33 | * core core pieces. |