Merge branch 'modules' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* 'modules' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: module: drop the lock while waiting for module to complete initialization. MODULE_DEVICE_TABLE(isapnp, ...) does nothing hisax_fcpcipnp: fix broken isapnp device table. isapnp: move definitions to mod_devicetable.h so file2alias can reach them.
Showing
- drivers/isdn/hisax/hisax_fcpcipnp.c 2 additions, 1 deletiondrivers/isdn/hisax/hisax_fcpcipnp.c
- include/linux/isapnp.h 1 addition, 7 deletionsinclude/linux/isapnp.h
- include/linux/mod_devicetable.h 7 additions, 0 deletionsinclude/linux/mod_devicetable.h
- kernel/module.c 37 additions, 22 deletionskernel/module.c
- scripts/mod/file2alias.c 17 additions, 0 deletionsscripts/mod/file2alias.c
Loading
Please register or sign in to comment