diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:43:52 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:43:52 -0500 |
| commit | 99cd7074891f87c49660e3b2880564324a4733ac (patch) | |
| tree | 903d2665bcb445f1f265d1adf7a99f265bcefc15 /drivers/char/Kconfig | |
| parent | e8a9cbf6ae620d9e5ba9cb42001c033287a284a3 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into tracing/urgent
Diffstat (limited to 'drivers/char/Kconfig')
| -rw-r--r-- | drivers/char/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 1697043119bd..f5be8081cd81 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig | |||
| @@ -616,6 +616,7 @@ config HVC_ISERIES | |||
| 616 | default y | 616 | default y |
| 617 | select HVC_DRIVER | 617 | select HVC_DRIVER |
| 618 | select HVC_IRQ | 618 | select HVC_IRQ |
| 619 | select VIOPATH | ||
| 619 | help | 620 | help |
| 620 | iSeries machines support a hypervisor virtual console. | 621 | iSeries machines support a hypervisor virtual console. |
| 621 | 622 | ||
| @@ -841,7 +842,7 @@ config JS_RTC | |||
| 841 | 842 | ||
| 842 | config GEN_RTC | 843 | config GEN_RTC |
| 843 | tristate "Generic /dev/rtc emulation" | 844 | tristate "Generic /dev/rtc emulation" |
| 844 | depends on RTC!=y && !IA64 && !ARM && !M32R && !MIPS && !SPARC && !FRV && !S390 && !SUPERH && !AVR32 | 845 | depends on RTC!=y && !IA64 && !ARM && !M32R && !MIPS && !SPARC && !FRV && !S390 && !SUPERH && !AVR32 && !BLACKFIN |
| 845 | ---help--- | 846 | ---help--- |
| 846 | If you say Y here and create a character special file /dev/rtc with | 847 | If you say Y here and create a character special file /dev/rtc with |
| 847 | major number 10 and minor number 135 using mknod ("man mknod"), you | 848 | major number 10 and minor number 135 using mknod ("man mknod"), you |