diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 20:21:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 20:21:00 -0400 |
| commit | f74b9444192c60603020c61d7915b72893137edc (patch) | |
| tree | 8b1d16d373234038c2b045c9ceb3c33b93059e8a /drivers/net | |
| parent | 7a6362800cb7d1d618a697a650c7aaed3eb39320 (diff) | |
| parent | 4ba8216cd90560bc402f52076f64d8546e8aefcb (diff) | |
Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
* 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
BKL: That's all, folks
fs/locks.c: Remove stale FIXME left over from BKL conversion
ipx: remove the BKL
appletalk: remove the BKL
x25: remove the BKL
ufs: remove the BKL
hpfs: remove the BKL
drivers: remove extraneous includes of smp_lock.h
tracing: don't trace the BKL
adfs: remove the big kernel lock
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/appletalk/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/appletalk/Kconfig b/drivers/net/appletalk/Kconfig index 0b376a990972..f5a89164e779 100644 --- a/drivers/net/appletalk/Kconfig +++ b/drivers/net/appletalk/Kconfig | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | # | 3 | # |
| 4 | config ATALK | 4 | config ATALK |
| 5 | tristate "Appletalk protocol support" | 5 | tristate "Appletalk protocol support" |
| 6 | depends on BKL # waiting to be removed from net/appletalk/ddp.c | ||
| 7 | select LLC | 6 | select LLC |
| 8 | ---help--- | 7 | ---help--- |
| 9 | AppleTalk is the protocol that Apple computers can use to communicate | 8 | AppleTalk is the protocol that Apple computers can use to communicate |