diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-06 13:42:33 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-06 13:42:33 -0400 |
| commit | 00dd7b7d26a3bf3780cfcebfdde2b86126b3a082 (patch) | |
| tree | 5129fd1abc99d0c58a520938f28bf330ae94ef30 /arch/ia64/configs | |
| parent | 58b3ac07fed31ffc1349380b78305af6522fe1f4 (diff) | |
| parent | 6e1e63259b1e01f047796e7985d960ca040993e6 (diff) | |
Merge ../linux-2.6
Conflicts:
arch/ia64/hp/sim/simscsi.c
Stylistic differences in two separate fixes for buffer->request_buffer
problem.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'arch/ia64/configs')
| -rw-r--r-- | arch/ia64/configs/sn2_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig index 9ea35398e10d..0f14a82b856e 100644 --- a/arch/ia64/configs/sn2_defconfig +++ b/arch/ia64/configs/sn2_defconfig | |||
| @@ -363,7 +363,7 @@ CONFIG_BLK_DEV_IDECD=y | |||
| 363 | # | 363 | # |
| 364 | CONFIG_IDE_GENERIC=y | 364 | CONFIG_IDE_GENERIC=y |
| 365 | CONFIG_BLK_DEV_IDEPCI=y | 365 | CONFIG_BLK_DEV_IDEPCI=y |
| 366 | # CONFIG_IDEPCI_SHARE_IRQ is not set | 366 | CONFIG_IDEPCI_SHARE_IRQ=y |
| 367 | # CONFIG_BLK_DEV_OFFBOARD is not set | 367 | # CONFIG_BLK_DEV_OFFBOARD is not set |
| 368 | # CONFIG_BLK_DEV_GENERIC is not set | 368 | # CONFIG_BLK_DEV_GENERIC is not set |
| 369 | # CONFIG_BLK_DEV_OPTI621 is not set | 369 | # CONFIG_BLK_DEV_OPTI621 is not set |