Merge branch 'tmp' into upstream

[linux-2.6-omap-h63xx.git] / drivers / net / myri_sbus.h

diff --git a/drivers/net/myri_sbus.h b/drivers/net/myri_sbus.h
index 9391e55a5e92488d247ae41875e8bf065a7bd93b..2f69ef7cdccbb40d0cf83e9466e4a408b4878466 100644 (file)
--- a/drivers/net/myri_sbus.h
+++ b/drivers/net/myri_sbus.h
@@ -290,13 +290,12 @@ struct myri_eth {
        unsigned int                    reg_size;       /* Size of register space.    */
        unsigned int                    shmem_base;     /* Offset to shared ram.      */
        struct sbus_dev                 *myri_sdev;     /* Our SBUS device struct.    */
-       struct myri_eth                 *next_module;   /* Next in adapter chain.     */
 };
 
 /* We use this to acquire receive skb's that we can DMA directly into. */
 #define ALIGNED_RX_SKB_ADDR(addr) \
         ((((unsigned long)(addr) + (64 - 1)) & ~(64 - 1)) - (unsigned long)(addr))
-static inline struct sk_buff *myri_alloc_skb(unsigned int length, int gfp_flags)
+static inline struct sk_buff *myri_alloc_skb(unsigned int length, gfp_t gfp_flags)
 {
        struct sk_buff *skb;