diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
| commit | 95d465fd750897ab32462a6702fbfe1b122cbbc0 (patch) | |
| tree | 65c38b2f11c51bb6932e44dd6c92f15b0091abfe /arch/powerpc/configs/ppc64_defconfig | |
| parent | 642fde17dceceb56c7ba2762733ac688666ae657 (diff) | |
| parent | 683aa4012f53b2ada0f430487e05d37b0d94e90a (diff) | |
Manual merge with Linus.
Conflicts:
arch/powerpc/kernel/setup-common.c
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/hil_ptr.c
Diffstat (limited to 'arch/powerpc/configs/ppc64_defconfig')
| -rw-r--r-- | arch/powerpc/configs/ppc64_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index 0362a70aa97c..395e49847788 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig | |||
| @@ -407,7 +407,7 @@ CONFIG_IDEPCI_SHARE_IRQ=y | |||
| 407 | # CONFIG_BLK_DEV_OFFBOARD is not set | 407 | # CONFIG_BLK_DEV_OFFBOARD is not set |
| 408 | CONFIG_BLK_DEV_GENERIC=y | 408 | CONFIG_BLK_DEV_GENERIC=y |
| 409 | # CONFIG_BLK_DEV_OPTI621 is not set | 409 | # CONFIG_BLK_DEV_OPTI621 is not set |
| 410 | # CONFIG_BLK_DEV_SL82C105 is not set | 410 | CONFIG_BLK_DEV_SL82C105=y |
| 411 | CONFIG_BLK_DEV_IDEDMA_PCI=y | 411 | CONFIG_BLK_DEV_IDEDMA_PCI=y |
| 412 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set | 412 | # CONFIG_BLK_DEV_IDEDMA_FORCED is not set |
| 413 | CONFIG_IDEDMA_PCI_AUTO=y | 413 | CONFIG_IDEDMA_PCI_AUTO=y |