diff options
| author | Linus Torvalds | 2008-04-26 18:48:00 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2008-04-26 18:48:00 +0200 |
| commit | 1292ebb82c00c69cf983e871faa221ce88ed3338 (patch) | |
| tree | 91f624dd175c9d3e842db78789c6a0c79a78eee5 /drivers/ide/pci/trm290.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86... (diff) | |
| parent | ide: sanitize handling of IDE_HFLAG_NO_SET_MODE host flag (diff) | |
| download | kernel-qcow2-linux-1292ebb82c00c69cf983e871faa221ce88ed3338.tar.gz kernel-qcow2-linux-1292ebb82c00c69cf983e871faa221ce88ed3338.tar.xz kernel-qcow2-linux-1292ebb82c00c69cf983e871faa221ce88ed3338.zip | |
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: (61 commits)
ide: sanitize handling of IDE_HFLAG_NO_SET_MODE host flag
sis5513: fail early for unsupported chipsets
it821x: fix kzalloc() failure handling
qd65xx: use IDE_HFLAG_SINGLE host flag
qd65xx: always use ->selectproc method
ide-cd: put proc-related functions together under single ifdef
ide-cd: Replace __FUNCTION__ with __func__
IDE: Coding Style fixes to drivers/ide/ide-cd.c
IDE: Coding Style fixes to drivers/ide/pci/cy82c693.c
IDE: Coding Style fixes to drivers/ide/pci/it8213.c
IDE: Coding Style fixes to drivers/ide/ide-floppy.c
IDE: Coding Style fixes to drivers/ide/legacy/ali14xx.c
IDE: Coding Style fixes to drivers/ide/legacy/hd.c
IDE: Coding Style fixes to drivers/ide/pci/cmd640.c
IDE: Coding Style fixes to drivers/ide/pci/opti621.c
IDE: Coding Style fixes to drivers/ide/ide-pnp.c
IDE: Coding Style fixes to drivers/ide/ide-proc.c
IDE: Coding Style fixes to drivers/ide/legacy/ide-4drives.c
IDE: Coding Style fixes to drivers/ide/legacy/umc8672.c
IDE: Coding Style fixes to drivers/ide/pci/generic.c
...
Diffstat (limited to 'drivers/ide/pci/trm290.c')
| -rw-r--r-- | drivers/ide/pci/trm290.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c index de750f7a43e9..2b8f3a2837d7 100644 --- a/drivers/ide/pci/trm290.c +++ b/drivers/ide/pci/trm290.c @@ -337,7 +337,6 @@ static const struct ide_port_info trm290_chipset __devinitdata = { IDE_HFLAG_TRUST_BIOS_FOR_DMA | #endif IDE_HFLAG_NO_AUTODMA | - IDE_HFLAG_BOOTABLE | IDE_HFLAG_NO_LBA48, }; |