diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 11:52:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-20 11:52:53 -0400 |
| commit | 5f7e08ca7b657f5678dd62a080f7f3a8f923ad02 (patch) | |
| tree | 8ec61964df164dd9a2b6d5cbabd338a5728b7e3a /drivers | |
| parent | 7f46e6ca0183568a688e6bfe40e3ab9adb305d03 (diff) | |
| parent | 56386f6424f242cff46e2cfd7be44624cd37dce1 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: (26 commits)
sh: intc - add support for SH7750 and its variants
sh: Move entry point code to .text.head.
sh: heartbeat: Shut up resource size warning.
sh: update r2d defconfig and fix SH7751R pci compliation
sh: Many symbol exports for nommu allmodconfig.
sh: zero terminate 8250 platform data for r2d board
sh: cpufreq: Fix up the build for SH-2.
sh: Make on-chip DMA channel selection explicit.
sh: Fix up CPU dependencies for on-chip DMAC.
sh: cpufreq: clock framework support.
sh: Support rate rounding for SH7722 FRQCR clocks.
sh: Implement clk_round_rate() in the clock framework.
sh: Fix up PCI section mismatch warnings.
sh: Wire up fallocate() syscall.
sh: intc - add support for 7780
sh: intc - improve group support
sh: Fix up SH-3 and SH-4 driver dependencies.
sh: push-switch: Correct license string.
sh: cpufreq: Fix driver dependencies and flag as broken.
sh: IPR/INTC2 IRQ setup consolidation.
...
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/watchdog/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/rtc/Kconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig index 2f48ba329961..ad5cc5f6862f 100644 --- a/drivers/char/watchdog/Kconfig +++ b/drivers/char/watchdog/Kconfig | |||
| @@ -602,7 +602,7 @@ config ZVM_WATCHDOG | |||
| 602 | 602 | ||
| 603 | config SH_WDT | 603 | config SH_WDT |
| 604 | tristate "SuperH Watchdog" | 604 | tristate "SuperH Watchdog" |
| 605 | depends on SUPERH | 605 | depends on SUPERH && (CPU_SH3 || CPU_SH4) |
| 606 | help | 606 | help |
| 607 | This driver adds watchdog support for the integrated watchdog in the | 607 | This driver adds watchdog support for the integrated watchdog in the |
| 608 | SuperH processors. If you have one of these processors and wish | 608 | SuperH processors. If you have one of these processors and wish |
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index cea401feb0f3..35f34665e3c4 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig | |||
| @@ -394,7 +394,7 @@ config RTC_DRV_SA1100 | |||
| 394 | 394 | ||
| 395 | config RTC_DRV_SH | 395 | config RTC_DRV_SH |
| 396 | tristate "SuperH On-Chip RTC" | 396 | tristate "SuperH On-Chip RTC" |
| 397 | depends on RTC_CLASS && SUPERH | 397 | depends on RTC_CLASS && SUPERH && (CPU_SH3 || CPU_SH4) |
| 398 | help | 398 | help |
| 399 | Say Y here to enable support for the on-chip RTC found in | 399 | Say Y here to enable support for the on-chip RTC found in |
| 400 | most SuperH processors. | 400 | most SuperH processors. |