Merge branch 'master' into upstream

[linux-2.6-omap-h63xx.git] / include / net / route.h

diff --git a/include/net/route.h b/include/net/route.h
index 9c04f15090d2b6b6e75060ab56dfb69047ea5db7..c4a068692dcc5e0f79ab58e1fd231043b5726236 100644 (file)
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -24,7 +24,6 @@
 #ifndef _ROUTE_H
 #define _ROUTE_H
 
-#include <linux/config.h>
 #include <net/dst.h>
 #include <net/inetpeer.h>
 #include <net/flow.h>
@@ -110,7 +109,7 @@ extern struct ip_rt_acct *ip_rt_acct;
 struct in_device;
 extern int             ip_rt_init(void);
 extern void            ip_rt_redirect(u32 old_gw, u32 dst, u32 new_gw,
-                                      u32 src, u8 tos, struct net_device *dev);
+                                      u32 src, struct net_device *dev);
 extern void            ip_rt_advice(struct rtable **rp, int advice);
 extern void            rt_cache_flush(int how);
 extern int             __ip_route_output_key(struct rtable **, const struct flowi *flp);