diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-12 21:51:51 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-12 21:51:51 -0500 |
| commit | 775ba7ad491a154f99871fe603f03366e84ae159 (patch) | |
| tree | 7112bd513ff7c60033f4ba07790cab8a7d3195a2 /drivers/char | |
| parent | d9405057c18cdc62eade7106a774d87a3e080875 (diff) | |
| parent | 18b36c7119aa868fdfae6855b86824db238e5ebc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
Fix inotify maintainers entry
Fix typo in new debug options.
Jon needs a new shift key.
fs: Convert kmalloc() + memset() to kzalloc() in fs/.
configfs.h: Remove dead macro definitions.
kconfig: Standardize "depends" -> "depends on" in Kconfig files
e100: replace kmalloc with kcalloc
um: replace kmalloc+memset with kzalloc
fix typo in net/ipv4/ip_fragment.c
include/linux/compiler.h: reject gcc 3 < gcc 3.2
Kconfig: fix spelling error in config KALLSYMS help text
Remove duplicate "have to" in comment
Fix small typo in drivers/serial/icom.c
Use consistent casing in help message
EXT{2,3,4}_FS: remove outdated part of the help text
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index b10f4d8fdc7f..0a3aee29e067 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig | |||
| @@ -867,7 +867,7 @@ config SONYPI | |||
| 867 | 867 | ||
| 868 | config TANBAC_TB0219 | 868 | config TANBAC_TB0219 |
| 869 | tristate "TANBAC TB0219 base board support" | 869 | tristate "TANBAC TB0219 base board support" |
| 870 | depends TANBAC_TB022X | 870 | depends on TANBAC_TB022X |
| 871 | select GPIO_VR41XX | 871 | select GPIO_VR41XX |
| 872 | 872 | ||
| 873 | source "drivers/char/agp/Kconfig" | 873 | source "drivers/char/agp/Kconfig" |