diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-18 18:15:49 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-18 18:15:49 +0100 |
| commit | af37501c792107c2bde1524bdae38d9a247b841a (patch) | |
| tree | b50ee90d29e72956b8b7d8d19677fe5996755d49 /drivers/net/hamradio | |
| parent | d859e29fe34cb833071b20aef860ee94fbad9bb2 (diff) | |
| parent | 99937d6455cea95405ac681c86a857d0fcd530bd (diff) | |
| download | talos-op-linux-af37501c792107c2bde1524bdae38d9a247b841a.tar.gz talos-op-linux-af37501c792107c2bde1524bdae38d9a247b841a.zip | |
Merge branch 'core/percpu' into perfcounters/core
Conflicts:
arch/x86/include/asm/pda.h
We merge tip/core/percpu into tip/perfcounters/core because of a
semantic and contextual conflict: the former eliminates the PDA,
while the latter extends it with apic_perf_irqs field.
Resolve the conflict by moving the new field to the irq_cpustat
structure on 64-bit too.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/hamradio')
| -rw-r--r-- | drivers/net/hamradio/6pack.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index 50f1e172ee8f..2d4089894ec7 100644 --- a/drivers/net/hamradio/6pack.c +++ b/drivers/net/hamradio/6pack.c @@ -717,11 +717,12 @@ static int sixpack_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg) { struct sixpack *sp = sp_get(tty); - struct net_device *dev = sp->dev; + struct net_device *dev; unsigned int tmp, err; if (!sp) return -ENXIO; + dev = sp->dev; switch(cmd) { case SIOCGIFNAME: |
