diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2010-08-16 13:32:24 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-08-16 13:32:24 +0900 |
| commit | bbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301 (patch) | |
| tree | 071fa9f86dc04a16570be367d04cff3b00c694ad /drivers/staging/ti-st/Kconfig | |
| parent | sh: Use __GFP_ZERO for dma_generic_alloc_coherent(). (diff) | |
| parent | Linux 2.6.36-rc1 (diff) | |
| download | linux-dev-bbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301.tar.xz linux-dev-bbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sh/include/asm/Kbuild
drivers/Makefile
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/staging/ti-st/Kconfig')
| -rw-r--r-- | drivers/staging/ti-st/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/ti-st/Kconfig b/drivers/staging/ti-st/Kconfig index 3ab204ddc29d..68ad3d0b84a7 100644 --- a/drivers/staging/ti-st/Kconfig +++ b/drivers/staging/ti-st/Kconfig @@ -4,7 +4,7 @@ # menu "Texas Instruments shared transport line discipline" config TI_ST - tristate "shared transport core driver" + tristate "Shared transport core driver" depends on RFKILL select FW_LOADER help |