diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
| commit | aa11d958d1a6572eda08214d7c6a735804fe48a5 (patch) | |
| tree | d025b05270ad1e010660d17eeadc6ac3c1abbd7d /drivers/vlynq/Kconfig | |
| parent | 07f6642ee9418e962e54cbc07471cfe2e559c568 (diff) | |
| parent | 9799218ae36910af50f002a5db1802d576fffb43 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
arch/microblaze/include/asm/socket.h
Diffstat (limited to 'drivers/vlynq/Kconfig')
| -rw-r--r-- | drivers/vlynq/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vlynq/Kconfig b/drivers/vlynq/Kconfig index f6542211db48..a9efb1625321 100644 --- a/drivers/vlynq/Kconfig +++ b/drivers/vlynq/Kconfig | |||
| @@ -13,7 +13,7 @@ config VLYNQ | |||
| 13 | 13 | ||
| 14 | config VLYNQ_DEBUG | 14 | config VLYNQ_DEBUG |
| 15 | bool "VLYNQ bus debug" | 15 | bool "VLYNQ bus debug" |
| 16 | depends on VLYNQ && KERNEL_DEBUG | 16 | depends on VLYNQ && DEBUG_KERNEL |
| 17 | help | 17 | help |
| 18 | Turn on VLYNQ bus debugging. | 18 | Turn on VLYNQ bus debugging. |
| 19 | 19 | ||