diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-18 16:29:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-18 16:29:26 -0400 |
| commit | 3a5c3743f15f27237ab025736a981e2d0c9fdfed (patch) | |
| tree | 13fc4d89901c2e2e187cfb44ab904bc587b0ab9c /include/linux/sdla.h | |
| parent | dc6b845044ccb7e9e6f3b7e71bd179b3cf0223b6 (diff) | |
| parent | 680ba7ca630f5816af9c80a946520be76b2167a5 (diff) | |
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/sdla.h')
| -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 { | |||
| 112 | short Tb_max; | 112 | short Tb_max; |
| 113 | }; | 113 | }; |
| 114 | 114 | ||
| 115 | #ifndef __KERNEL__ | 115 | #ifdef __KERNEL__ |
| 116 | |||
| 117 | void sdla(void *cfg_info, char *dev, struct frad_conf *conf, int quiet); | ||
| 118 | |||
| 119 | #else | ||
| 120 | 116 | ||
| 121 | /* important Z80 window addresses */ | 117 | /* important Z80 window addresses */ |
| 122 | #define SDLA_CONTROL_WND 0xE000 | 118 | #define SDLA_CONTROL_WND 0xE000 |