Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

[linux-2.6-omap-h63xx.git] / include / asm-mips / sn / klconfig.h

diff --git a/include/asm-mips/sn/klconfig.h b/include/asm-mips/sn/klconfig.h
index dc706268d2cf2db06da61d82c51cb7e5cc052be6..b63cd0655b3d554d2145acd134d2815c67e69f22 100644 (file)
--- a/include/asm-mips/sn/klconfig.h
+++ b/include/asm-mips/sn/klconfig.h
@@ -27,7 +27,6 @@
  *      that offsets of existing fields do not change.
  */
 
-#include <linux/config.h>
 #include <linux/types.h>
 #include <asm/sn/types.h>
 
@@ -603,7 +602,7 @@ typedef struct klcpu_s {                          /* CPU */
 
 typedef struct klhub_s {                       /* HUB */
        klinfo_t        hub_info;
-       uint            hub_flags;              /* PCFG_HUB_xxx flags */
+       unsigned int            hub_flags;              /* PCFG_HUB_xxx flags */
        klport_t        hub_port;               /* hub is connected to this */
        nic_t           hub_box_nic;            /* nic of containing box */
        klconf_off_t    hub_mfg_nic;            /* MFG NIC string */
@@ -612,7 +611,7 @@ typedef struct klhub_s {                    /* HUB */
 
 typedef struct klhub_uart_s {                  /* HUB */
        klinfo_t        hubuart_info;
-       uint            hubuart_flags;          /* PCFG_HUB_xxx flags */
+       unsigned int            hubuart_flags;          /* PCFG_HUB_xxx flags */
        nic_t           hubuart_box_nic;        /* nic of containing box */
 } klhub_uart_t ;
 
@@ -711,7 +710,7 @@ typedef struct klvmed_s {                          /* VME DEVICE - VME BOARD */
 /* XXX - Don't we need the number of ports here?!? */
 typedef struct klrou_s {                          /* ROUTER */
        klinfo_t        rou_info ;
-       uint            rou_flags ;           /* PCFG_ROUTER_xxx flags */
+       unsigned int            rou_flags ;           /* PCFG_ROUTER_xxx flags */
        nic_t           rou_box_nic ;         /* nic of the containing module */
        klport_t        rou_port[MAX_ROUTER_PORTS + 1] ; /* array index 1 to 6 */
        klconf_off_t    rou_mfg_nic ;     /* MFG NIC string */
@@ -734,8 +733,8 @@ typedef struct klgfx_s {            /* GRAPHICS Device */
        klinfo_t        gfx_info;
        klconf_off_t    old_gndevs;     /* for compatibility with older proms */
        klconf_off_t    old_gdoff0;     /* for compatibility with older proms */
-       uint            cookie;         /* for compatibility with older proms */
-       uint            moduleslot;
+       unsigned int            cookie;         /* for compatibility with older proms */
+       unsigned int            moduleslot;
        struct klgfx_s  *gfx_next_pipe;
        graphics_t      gfx_specific;
        klconf_off_t    pad0;           /* for compatibility with older proms */