Merge v2.6.37-rc8 into powerpc/next

1 files changed, 5 insertions, 3 deletions

diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
index f6481daf6e52..475f8c42c0e9 100644
--- a/include/linux/atmdev.h
+++ b/include/linux/atmdev.h
@@ -427,8 +427,10 @@ extern rwlock_t vcc_sklist_lock;
 
 #define ATM_SKB(skb) (((struct atm_skb_data *) (skb)->cb))
 
-struct atm_dev *atm_dev_register(const char *type,const struct atmdev_ops *ops,
-    int number,unsigned long *flags); /* number == -1: pick first available */
+struct atm_dev *atm_dev_register(const char *type, struct device *parent,
+                                 const struct atmdev_ops *ops,
+                                 int number, /* -1 == pick first available */
+                                 unsigned long *flags);
 struct atm_dev *atm_dev_lookup(int number);
 void atm_dev_deregister(struct atm_dev *dev);
 
@@ -449,7 +451,7 @@ void vcc_insert_socket(struct sock *sk);
 
 static inline int atm_guess_pdu2truesize(int size)
 {
-        return (SKB_DATA_ALIGN(size) + sizeof(struct skb_shared_info));
+        return SKB_DATA_ALIGN(size) + sizeof(struct skb_shared_info);
 }