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
This commit is contained in:
commit
d858196990
@ -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
|
||||
|
||||
|
@ -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)
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user