diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-18 13:29:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-18 13:29:26 -0700 |
| commit | 3a5c3743f15f27237ab025736a981e2d0c9fdfed (patch) | |
| tree | 13fc4d89901c2e2e187cfb44ab904bc587b0ab9c /include/linux | |
| parent | si4713-i2c: avoid potential buffer overflow on si4713 (diff) | |
| parent | pppoe: Must flush connections when MAC address changes too. (diff) | |
| download | wireguard-linux-3a5c3743f15f27237ab025736a981e2d0c9fdfed.tar.xz wireguard-linux-3a5c3743f15f27237ab025736a981e2d0c9fdfed.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
pppoe: Must flush connections when MAC address changes too.
include/linux/sdla.h: remove the prototype of sdla()
tulip: dmfe: Remove old log spamming pr_debugs
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/sdla.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/sdla.h b/include/linux/sdla.h index 564acd3a71c1..9995c7fc3f60 100644 --- a/include/linux/sdla.h +++ b/include/linux/sdla.h @@ -112,11 +112,7 @@ struct sdla_dlci_conf { short Tb_max; }; -#ifndef __KERNEL__ - -void sdla(void *cfg_info, char *dev, struct frad_conf *conf, int quiet); - -#else +#ifdef __KERNEL__ /* important Z80 window addresses */ #define SDLA_CONTROL_WND 0xE000 |