diff --git a/[refs] b/[refs] index aea2b9141f4c..8d8211c6ac97 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5e38a949bfa11d10f73927fbf4fe66b73bc3001 +refs/heads/master: dc13b385999f163dc30c73d66f2ac6d67410528d diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c index ecfaf1460b1a..6e91b4b7aabb 100644 --- a/trunk/drivers/net/bonding/bond_main.c +++ b/trunk/drivers/net/bonding/bond_main.c @@ -3065,8 +3065,6 @@ void bond_activebackup_arp_mon(struct work_struct *work) #ifdef CONFIG_PROC_FS -#define SEQ_START_TOKEN ((void *)1) - static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos) { struct bonding *bond = seq->private;