diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 12:13:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 12:13:53 -0400 |
| commit | da104a83692cf07434ab3b20bf10093bdbc3f97e (patch) | |
| tree | 6343600c318c600f0dcdf71406bf7d993823afd4 /arch/s390/defconfig | |
| parent | 96e1a87392293cf895ea99ab70758453897c7bbf (diff) | |
| parent | dc64bef5439c8e1fafea225054da4d8882c9d10c (diff) | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] Use CONFIG_GENERIC_TIME and define TOD clock source.
[PATCH] sysrq: irq change build fix.
[S390] irq change build fixes.
[S390] cio: 0 is a valid chpid.
[S390] monwriter buffer limit.
[S390] ap bus poll thread priority.
Diffstat (limited to 'arch/s390/defconfig')
| -rw-r--r-- | arch/s390/defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/defconfig b/arch/s390/defconfig index b6cad75fd1f4..a3257398ea8d 100644 --- a/arch/s390/defconfig +++ b/arch/s390/defconfig | |||
| @@ -9,6 +9,7 @@ CONFIG_STACKTRACE_SUPPORT=y | |||
| 9 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 9 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
| 10 | CONFIG_GENERIC_HWEIGHT=y | 10 | CONFIG_GENERIC_HWEIGHT=y |
| 11 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 11 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
| 12 | CONFIG_GENERIC_TIME=y | ||
| 12 | CONFIG_S390=y | 13 | CONFIG_S390=y |
| 13 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | 14 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |
| 14 | 15 | ||