diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-07-06 22:55:05 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-07-06 22:55:05 -0400 |
| commit | 2b5c0c72ea404d6b554a8284031dd78748314b9e (patch) | |
| tree | 468b7f3d8db0abe6a09ee221dce1de5de2bb8d12 /drivers/vlynq | |
| parent | 2dbc8a23cc2e677422f6dea991aca4e3d31ab65f (diff) | |
| parent | dc53fffc105f68cb08ca872acd51550e89aa2e67 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/for-2.6.31
Diffstat (limited to 'drivers/vlynq')
| -rw-r--r-- | drivers/vlynq/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/vlynq/vlynq.c | 2 |
2 files changed, 2 insertions, 2 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 | ||
diff --git a/drivers/vlynq/vlynq.c b/drivers/vlynq/vlynq.c index 7335433b067b..f05d2a368367 100644 --- a/drivers/vlynq/vlynq.c +++ b/drivers/vlynq/vlynq.c | |||
| @@ -76,7 +76,7 @@ struct vlynq_regs { | |||
| 76 | u32 int_device[8]; | 76 | u32 int_device[8]; |
| 77 | }; | 77 | }; |
| 78 | 78 | ||
| 79 | #ifdef VLYNQ_DEBUG | 79 | #ifdef CONFIG_VLYNQ_DEBUG |
| 80 | static void vlynq_dump_regs(struct vlynq_device *dev) | 80 | static void vlynq_dump_regs(struct vlynq_device *dev) |
| 81 | { | 81 | { |
| 82 | int i; | 82 | int i; |