Cset exclude: akpm <at> osdl.org|ChangeSet|20031029192849|64746

ChangeSet 1.1404, 2003/11/01 23:09:49-08:00, davem <at> nuts.ninka.net

	Cset exclude: akpm <at> osdl.org|ChangeSet|20031029192849|64746

# This patch includes the following deltas:
#	           ChangeSet	1.1403  -> 1.1404 
#	      net/core/dev.c	1.122   -> 1.123  
#	drivers/pnp/isapnp/core.c	1.44    -> 1.45   
#

 drivers/pnp/isapnp/core.c |    2 +-
 net/core/dev.c            |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff -Nru a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
--- a/drivers/pnp/isapnp/core.c	Mon Nov  3 17:08:54 2003
+++ b/drivers/pnp/isapnp/core.c	Mon Nov  3 17:08:54 2003
 <at>  <at>  -1160,7 +1160,7  <at>  <at> 
 	return 0;
 }

-fs_initcall(isapnp_init);
+device_initcall(isapnp_init);

 /* format is: noisapnp */

diff -Nru a/net/core/dev.c b/net/core/dev.c
--- a/net/core/dev.c	Mon Nov  3 17:08:54 2003
+++ b/net/core/dev.c	Mon Nov  3 17:08:54 2003
 <at>  <at>  -3049,7 +3049,7  <at>  <at> 
 	return rc;
 }

-fs_initcall(net_dev_init);
+subsys_initcall(net_dev_init);

 EXPORT_SYMBOL(__dev_get);
 EXPORT_SYMBOL(__dev_get_by_flags);