Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / cxgb4 / cxgb4.h

diff --git a/drivers/net/cxgb4/cxgb4.h b/drivers/net/cxgb4/cxgb4.h
index 3d4253d311eb50972c3037fb5e7b52ef2b18395b..01d49eaa44d278fe2d7f0d5189ace1c9a96f63d6 100644 (file)
--- a/drivers/net/cxgb4/cxgb4.h
+++ b/drivers/net/cxgb4/cxgb4.h
@@ -482,11 +482,9 @@ struct adapter {
        void __iomem *regs;
        struct pci_dev *pdev;
        struct device *pdev_dev;
-       unsigned long registered_device_map;
        unsigned int fn;
        unsigned int flags;
 
-       const char *name;
        int msg_enable;
 
        struct adapter_params params;
@@ -497,7 +495,7 @@ struct adapter {
 
        struct {
                unsigned short vec;
-               char desc[14];
+               char desc[IFNAMSIZ + 10];
        } msix_info[MAX_INGQ + 1];
 
        struct sge sge;