diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-06-08 13:44:21 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-08 13:44:21 -0400 |
| commit | c0c33addcba2ce753b4e2746db99feaae2f82a85 (patch) | |
| tree | dab480183ac0e64bfe9250e1f294705d1a424c78 /drivers/bcma/Kconfig | |
| parent | ffbc03bc75b39c7bd412e7cc6d2185c11b0ffedd (diff) | |
| parent | 931749bf78b969c54de9bbc67cf29b13a40bb73b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/bcma/Kconfig')
| -rw-r--r-- | drivers/bcma/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/bcma/Kconfig b/drivers/bcma/Kconfig index 353781b5b78b..83e9adf46441 100644 --- a/drivers/bcma/Kconfig +++ b/drivers/bcma/Kconfig | |||
| @@ -13,6 +13,11 @@ config BCMA | |||
| 13 | Bus driver for Broadcom specific Advanced Microcontroller Bus | 13 | Bus driver for Broadcom specific Advanced Microcontroller Bus |
| 14 | Architecture. | 14 | Architecture. |
| 15 | 15 | ||
| 16 | # Support for Block-I/O. SELECT this from the driver that needs it. | ||
| 17 | config BCMA_BLOCKIO | ||
| 18 | bool | ||
| 19 | depends on BCMA | ||
| 20 | |||
| 16 | config BCMA_HOST_PCI_POSSIBLE | 21 | config BCMA_HOST_PCI_POSSIBLE |
| 17 | bool | 22 | bool |
| 18 | depends on BCMA && PCI = y | 23 | depends on BCMA && PCI = y |