Merge branch 'warnings' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6

* 'warnings' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
ni5010: kill unused variable
eexpress: fix !SMP unused-var warning
cgroup: kill unused variable

+1 -4
+1 -1
drivers/net/eexpress.c
··· 651 */ 652 static int eexp_xmit(struct sk_buff *buf, struct net_device *dev) 653 { 654 - struct net_local *lp = netdev_priv(dev); 655 short length = buf->len; 656 #ifdef CONFIG_SMP 657 unsigned long flags; 658 #endif 659
··· 651 */ 652 static int eexp_xmit(struct sk_buff *buf, struct net_device *dev) 653 { 654 short length = buf->len; 655 #ifdef CONFIG_SMP 656 + struct net_local *lp = netdev_priv(dev); 657 unsigned long flags; 658 #endif 659
-2
drivers/net/ni5010.c
··· 518 /* We have a good packet, get it out of the buffer. */ 519 static void ni5010_rx(struct net_device *dev) 520 { 521 - struct ni5010_local *lp = netdev_priv(dev); 522 int ioaddr = dev->base_addr; 523 unsigned char rcv_stat; 524 struct sk_buff *skb; ··· 576 577 PRINTK2((KERN_DEBUG "%s: Received packet, size=%#4.4x\n", 578 dev->name, i_pkt_size)); 579 - 580 } 581 582 static int process_xmt_interrupt(struct net_device *dev)
··· 518 /* We have a good packet, get it out of the buffer. */ 519 static void ni5010_rx(struct net_device *dev) 520 { 521 int ioaddr = dev->base_addr; 522 unsigned char rcv_stat; 523 struct sk_buff *skb; ··· 577 578 PRINTK2((KERN_DEBUG "%s: Received packet, size=%#4.4x\n", 579 dev->name, i_pkt_size)); 580 } 581 582 static int process_xmt_interrupt(struct net_device *dev)
-1
kernel/cgroup.c
··· 2402 static int proc_cgroupstats_show(struct seq_file *m, void *v) 2403 { 2404 int i; 2405 - struct cgroupfs_root *root; 2406 2407 seq_puts(m, "#subsys_name\thierarchy\tnum_cgroups\n"); 2408 mutex_lock(&cgroup_mutex);
··· 2402 static int proc_cgroupstats_show(struct seq_file *m, void *v) 2403 { 2404 int i; 2405 2406 seq_puts(m, "#subsys_name\thierarchy\tnum_cgroups\n"); 2407 mutex_lock(&cgroup_mutex);