diff --git a/[refs] b/[refs]
index 30f50c27b383..224dfe248be1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a60c4923da795c74db9ff61a60e2f1df5754e4ce
+refs/heads/master: ff428d72c59b35e4ba34bc1b487e707648010fe3
diff --git a/trunk/include/linux/inetdevice.h b/trunk/include/linux/inetdevice.h
index 40d07d0b896b..5ae09372c144 100644
--- a/trunk/include/linux/inetdevice.h
+++ b/trunk/include/linux/inetdevice.h
@@ -105,7 +105,7 @@ extern int register_inetaddr_notifier(struct notifier_block *nb);
 extern int unregister_inetaddr_notifier(struct notifier_block *nb);
 
 extern struct net_device 	*ip_dev_find(u32 addr);
-extern int		inet_addr_onlink(struct in_device *in_dev, u32 a, u32 b);
+extern int		inet_addr_onlink(struct in_device *in_dev, __be32 a, __be32 b);
 extern int		devinet_ioctl(unsigned int cmd, void __user *);
 extern void		devinet_init(void);
 extern struct in_device *inetdev_init(struct net_device *dev);
diff --git a/trunk/net/ipv4/devinet.c b/trunk/net/ipv4/devinet.c
index bffbbecef455..5988584f6a6d 100644
--- a/trunk/net/ipv4/devinet.c
+++ b/trunk/net/ipv4/devinet.c
@@ -224,7 +224,7 @@ static void inetdev_destroy(struct in_device *in_dev)
 	call_rcu(&in_dev->rcu_head, in_dev_rcu_put);
 }
 
-int inet_addr_onlink(struct in_device *in_dev, u32 a, u32 b)
+int inet_addr_onlink(struct in_device *in_dev, __be32 a, __be32 b)
 {
 	rcu_read_lock();
 	for_primary_ifa(in_dev) {