diff --git a/[refs] b/[refs] index 2e3d876d11f0..e657f985c378 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8da5bb7a274559737defa400a42461e1366fc30a +refs/heads/master: 2b1ea591f6714729e5a998064ba9bff503137aa8 diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00lib.h b/trunk/drivers/net/wireless/rt2x00/rt2x00lib.h index 0bf10ffec70a..108488ddbbb9 100644 --- a/trunk/drivers/net/wireless/rt2x00/rt2x00lib.h +++ b/trunk/drivers/net/wireless/rt2x00/rt2x00lib.h @@ -91,7 +91,7 @@ static inline void rt2x00debug_deregister(struct rt2x00_dev *rt2x00dev) } static inline void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev, - struct skb_buff *skb) + struct sk_buff *skb) { } #endif /* CONFIG_RT2X00_LIB_DEBUGFS */