Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (76 commits) IDE: Report errors during drive reset back to user space Update documentation of HDIO_DRIVE_RESET ioctl IDE: Remove unused code IDE: Fix HDIO_DRIVE_RESET handling hd.c: remove the #include <linux/mc146818rtc.h> update the BLK_DEV_HD help text move ide/legacy/hd.c to drivers/block/ ide/legacy/hd.c: use late_initcall() remove BLK_DEV_HD_ONLY ide: endian annotations in ide-floppy.c ide-floppy: zero out the whole struct ide_atapi_pc on init ide-floppy: fold idefloppy_create_test_unit_ready_cmd into idefloppy_open ide-cd: move request prep chunk from cdrom_do_newpc_cont to rq issue path ide-cd: move request prep from cdrom_start_rw_cont to rq issue path ide-cd: move request prep from cdrom_start_seek_continuation to rq issue path ide-cd: fold cdrom_start_seek into ide_cd_do_request ide-cd: simplify request issuing path ide-cd: mv ide_do_rw_cdrom ide_cd_do_request ide-cd: cdrom_start_seek: remove unused argument block ide-cd: ide_do_rw_cdrom: add the catch-all bad request case to the if-else block ...
Showing
- Documentation/ioctl/hdio.txt 4 additions, 3 deletionsDocumentation/ioctl/hdio.txt
- drivers/block/Kconfig 12 additions, 0 deletionsdrivers/block/Kconfig
- drivers/block/Makefile 1 addition, 0 deletionsdrivers/block/Makefile
- drivers/block/hd.c 1 addition, 2 deletionsdrivers/block/hd.c
- drivers/ide/Kconfig 15 additions, 73 deletionsdrivers/ide/Kconfig
- drivers/ide/Makefile 3 additions, 7 deletionsdrivers/ide/Makefile
- drivers/ide/arm/Makefile 0 additions, 1 deletiondrivers/ide/arm/Makefile
- drivers/ide/arm/bast-ide.c 0 additions, 90 deletionsdrivers/ide/arm/bast-ide.c
- drivers/ide/arm/icside.c 55 additions, 50 deletionsdrivers/ide/arm/icside.c
- drivers/ide/arm/palm_bk3710.c 0 additions, 3 deletionsdrivers/ide/arm/palm_bk3710.c
- drivers/ide/arm/rapide.c 19 additions, 14 deletionsdrivers/ide/arm/rapide.c
- drivers/ide/h8300/ide-h8300.c 11 additions, 8 deletionsdrivers/ide/h8300/ide-h8300.c
- drivers/ide/ide-cd.c 77 additions, 83 deletionsdrivers/ide/ide-cd.c
- drivers/ide/ide-disk.c 0 additions, 1 deletiondrivers/ide/ide-disk.c
- drivers/ide/ide-floppy.c 12 additions, 20 deletionsdrivers/ide/ide-floppy.c
- drivers/ide/ide-io.c 22 additions, 50 deletionsdrivers/ide/ide-io.c
- drivers/ide/ide-iops.c 18 additions, 6 deletionsdrivers/ide/ide-iops.c
- drivers/ide/ide-lib.c 0 additions, 151 deletionsdrivers/ide/ide-lib.c
- drivers/ide/ide-pio-blacklist.c 94 additions, 0 deletionsdrivers/ide/ide-pio-blacklist.c
- drivers/ide/ide-pnp.c 2 additions, 2 deletionsdrivers/ide/ide-pnp.c
Loading
Please register or sign in to comment