The patch titled
remove the obsolete IDEPCI_FLAG_FORCE_PDC
has been removed from the -mm tree. Its filename is
remove-the-obsolete-idepci_flag_force_pdc.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Adrian Bunk <bunk@xxxxxxxxx>
Noted by Sergei Shtylylov <sshtylyov@xxxxxxxxxxxxx>
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ide/pci/pdc202xx_old.c | 2 --
drivers/ide/setup-pci.c | 13 -------------
include/linux/ide.h | 1 -
3 files changed, 16 deletions(-)
diff -puN drivers/ide/pci/pdc202xx_old.c~remove-the-obsolete-idepci_flag_force_pdc drivers/ide/pci/pdc202xx_old.c
--- devel/drivers/ide/pci/pdc202xx_old.c~remove-the-obsolete-idepci_flag_force_pdc 2006-04-18 22:20:03.000000000 -0700
+++ devel-akpm/drivers/ide/pci/pdc202xx_old.c 2006-04-18 22:20:03.000000000 -0700
@@ -798,7 +798,6 @@ static ide_pci_device_t pdc202xx_chipset
.autodma = AUTODMA,
.bootable = OFF_BOARD,
.extra = 48,
- .flags = IDEPCI_FLAG_FORCE_PDC,
},{ /* 2 */
.name = "PDC20263",
.init_setup = init_setup_pdc202ata4,
@@ -819,7 +818,6 @@ static ide_pci_device_t pdc202xx_chipset
.autodma = AUTODMA,
.bootable = OFF_BOARD,
.extra = 48,
- .flags = IDEPCI_FLAG_FORCE_PDC,
},{ /* 4 */
.name = "PDC20267",
.init_setup = init_setup_pdc202xx,
diff -puN drivers/ide/setup-pci.c~remove-the-obsolete-idepci_flag_force_pdc drivers/ide/setup-pci.c
--- devel/drivers/ide/setup-pci.c~remove-the-obsolete-idepci_flag_force_pdc 2006-04-18 22:20:03.000000000 -0700
+++ devel-akpm/drivers/ide/setup-pci.c 2006-04-18 22:20:03.000000000 -0700
@@ -580,7 +580,6 @@ void ide_pci_setup_ports(struct pci_dev
int port;
int at_least_one_hwif_enabled = 0;
ide_hwif_t *hwif, *mate = NULL;
- static int secondpdc = 0;
u8 tmp;
index->all = 0xf0f0;
@@ -592,21 +591,9 @@ void ide_pci_setup_ports(struct pci_dev
for (port = 0; port <= 1; ++port) {
ide_pci_enablebit_t *e = &(d->enablebits[port]);
- /*
- * If this is a Promise FakeRaid controller,
- * the 2nd controller will be marked as
- * disabled while it is actually there and enabled
- * by the bios for raid purposes.
- * Skip the normal "is it enabled" test for those.
- */
- if ((d->flags & IDEPCI_FLAG_FORCE_PDC) &&
- (secondpdc++==1) && (port==1))
- goto controller_ok;
-
if (e->reg && (pci_read_config_byte(dev, e->reg, &tmp) ||
(tmp & e->mask) != e->val))
continue; /* port not enabled */
-controller_ok:
if (d->channels <= port)
break;
diff -puN include/linux/ide.h~remove-the-obsolete-idepci_flag_force_pdc include/linux/ide.h
--- devel/include/linux/ide.h~remove-the-obsolete-idepci_flag_force_pdc 2006-04-18 22:20:03.000000000 -0700
+++ devel-akpm/include/linux/ide.h 2006-04-18 22:20:03.000000000 -0700
@@ -1220,7 +1220,6 @@ typedef struct ide_pci_enablebit_s {
enum {
/* Uses ISA control ports not PCI ones. */
IDEPCI_FLAG_ISA_PORTS = (1 << 0),
- IDEPCI_FLAG_FORCE_PDC = (1 << 1),
};
typedef struct ide_pci_device_s {
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
origin.patch
fix-section-mismatch-in-pm2fbo.patch
git-acpi.patch
acpiphp-use-new-dock-driver-fix.patch
git-dvb.patch
drivers-media-video-bt866c-small-fixes-2.patch
gregkh-i2c-w1-cleanups-fix.patch
git-infiniband.patch
git-intelfb.patch
git-ocfs2.patch
gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch
drivers-scsi-aic7xxx-possible-cleanups.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-megaraidc-add-a-dummy-mega_create_proc_entry-for-proc_fs=y.patch
drivers-scsi-gdthc-make-__gdth_execute-static.patch
drivers-scsi-qla2xxx-make-some-functions-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_done_with_status-static.patch
scsi-megaraid-megaraid_mmc-fix-a-null-pointer-dereference.patch
remove-drivers-scsi-constantscscsi_print_req_sense.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-aic7xxx-possible-cleanups-2.patch
ieee80211_wxc-remove-dead-code.patch
bcm43xx_phyc-fix-a-memory-leak.patch
memory_hotplugh-cleanup.patch
acx1xx-wireless-driver.patch
arch-i386-kernel-apicc-make-modern_apic-static.patch
drivers-acpi-busc-make-struct-acpi_sci_dir-static.patch
kernel-power-snapshotc-cleanups.patch
remove-fs-jffs2-ioctlc.patch
update-obsolete_oss_driver-schedule-and-dependencies.patch
make-the-oss-sound_via82cxxx-option-available-again.patch
fs-locksc-make-posix_locks_deadlock-static.patch
remove-config_parport_arc-drivers-parport-parport_arcc.patch
fs-fat-miscc-unexport-fat_sync_bhs.patch
the-scheduled-unexport-of-insert_resource.patch
time-i386-clocksource-drivers.patch
dlm-recovery.patch
dlm-build.patch
dlm-cleanup-unused-functions.patch
dlm-include-own-headers.patch
reiser4.patch
fs-reiser4-misc-cleanups.patch
nmi-lockup-and-altsysrq-p-dumping-calltraces-on-_all_-cpus.patch
slab-cache-shrinker-statistics.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.patch
drivers-char-ipmi-ipmi_msghandlerc-make-proc_ipmi_root-static.patch
drivers-message-i2o-iopc-unexport-i2o_msg_nop.patch
x86_64-unexport-ia32_sys_call_table.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
