Merge branch 'media_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[mv-sheeva.git] / include / net / ipconfig.h

diff --git a/include/net/ipconfig.h b/include/net/ipconfig.h
index 2a1fe996fbc63064db309d88c8e93e38747db355..c74cc1bd5a0276ef470d650e99b362d5fee7baa7 100644 (file)
--- a/include/net/ipconfig.h
+++ b/include/net/ipconfig.h
@@ -1,6 +1,4 @@
 /*
- *  $Id: ipconfig.h,v 1.4 2001/04/30 04:51:46 davem Exp $
- *
  *  Copyright (C) 1997 Martin Mares
  *
  *  Automatic IP Layer Configuration
@@ -11,12 +9,12 @@
 extern int ic_proto_enabled;   /* Protocols enabled (see IC_xxx) */
 extern int ic_set_manually;    /* IPconfig parameters set manually */
 
-extern u32 ic_myaddr;          /* My IP address */
-extern u32 ic_gateway;         /* Gateway IP address */
+extern __be32 ic_myaddr;               /* My IP address */
+extern __be32 ic_gateway;              /* Gateway IP address */
 
-extern u32 ic_servaddr;                /* Boot server IP address */
+extern __be32 ic_servaddr;             /* Boot server IP address */
 
-extern u32 root_server_addr;   /* Address of NFS server */
+extern __be32 root_server_addr;        /* Address of NFS server */
 extern u8 root_server_path[];  /* Path to mount as root */