diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 18:57:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 18:57:22 -0700 |
| commit | d8581969904b8a72db726c4b9090234c0f0bb18f (patch) | |
| tree | 784f83eaf9cd302729f67a18dc32f5bf6cb03a77 | |
| parent | 5a0e554b62dc77709ceebb6326b292bdd8d2c342 (diff) | |
| parent | e0f13920d6a082d85e21a1b4c02907446198fc36 (diff) | |
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
| -rw-r--r-- | drivers/net/eexpress.c | 2 | ||||
| -rw-r--r-- | drivers/net/ni5010.c | 2 | ||||
| -rw-r--r-- | kernel/cgroup.c | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c index 9c85e50014b4..70509ed6c11d 100644 --- a/drivers/net/eexpress.c +++ b/drivers/net/eexpress.c @@ -651,9 +651,9 @@ static void eexp_timeout(struct net_device *dev) */ static int eexp_xmit(struct sk_buff *buf, struct net_device *dev) { - struct net_local *lp = netdev_priv(dev); short length = buf->len; #ifdef CONFIG_SMP + struct net_local *lp = netdev_priv(dev); unsigned long flags; #endif diff --git a/drivers/net/ni5010.c b/drivers/net/ni5010.c index 14a768fbce2e..a20005c09e07 100644 --- a/drivers/net/ni5010.c +++ b/drivers/net/ni5010.c @@ -518,7 +518,6 @@ static void dump_packet(void *buf, int len) /* We have a good packet, get it out of the buffer. */ static void ni5010_rx(struct net_device *dev) { - struct ni5010_local *lp = netdev_priv(dev); int ioaddr = dev->base_addr; unsigned char rcv_stat; struct sk_buff *skb; @@ -577,7 +576,6 @@ static void ni5010_rx(struct net_device *dev) PRINTK2((KERN_DEBUG "%s: Received packet, size=%#4.4x\n", dev->name, i_pkt_size)); - } static int process_xmt_interrupt(struct net_device *dev) diff --git a/kernel/cgroup.c b/kernel/cgroup.c index 5987dccdb2a0..3fe21e19c96e 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -2402,7 +2402,6 @@ struct file_operations proc_cgroup_operations = { static int proc_cgroupstats_show(struct seq_file *m, void *v) { int i; - struct cgroupfs_root *root; seq_puts(m, "#subsys_name\thierarchy\tnum_cgroups\n"); mutex_lock(&cgroup_mutex); |