debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Merge /dists/sid/linux-2.6. 

svn path=/dists/trunk/linux-2.6/; revision=8499
This commit is contained in:
Bastian Blank 2007-04-24 07:01:08 +00:00
parent e5cb7f70b9
commit da3eeeecf6
13 changed files with 113 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/arch/alpha/config vendored
View File

@ -375,9 +375,6 @@ CONFIG_IPX=m
CONFIG_ATALK=m
CONFIG_DEV_APPLETALK=y
CONFIG_LTPC=m
CONFIG_COPS=m
CONFIG_COPS_DAYNA=y
CONFIG_COPS_TANGENT=y
CONFIG_IPDDP=m
CONFIG_IPDDP_ENCAP=y
CONFIG_IPDDP_DECAP=y
@ -581,7 +578,6 @@ CONFIG_2BUFF_MODE=y
CONFIG_TR=y
CONFIG_IBMTR=m
CONFIG_IBMOL=m
CONFIG_3C359=m
CONFIG_TMS380TR=m
CONFIG_TMSPCI=m
CONFIG_SKISA=m

2
debian/arch/alpha/defines vendored
View File

@ -1,5 +1,5 @@
[base]
flavours: alpha-generic alpha-smp alpha-legacy
#flavours: alpha-generic alpha-smp alpha-legacy
kernel-arch: alpha
kernel-header-dirs: alpha
subarches:

1
debian/arch/amd64/config vendored
View File

@ -508,7 +508,6 @@ CONFIG_IXGB=m
CONFIG_S2IO=m
CONFIG_TR=y
CONFIG_IBMOL=m
CONFIG_3C359=m
CONFIG_TMS380TR=m
CONFIG_TMSPCI=m
CONFIG_ABYSS=m

1
debian/arch/arm/config.footbridge vendored
View File

@ -1407,7 +1407,6 @@ CONFIG_USB_MON=y
#
# USB Miscellaneous drivers
#
CONFIG_USB_EMI26=m
# CONFIG_USB_AUERSWALD is not set
# CONFIG_USB_RIO500 is not set
# CONFIG_USB_LEGOTOWER is not set

2
debian/arch/arm/config.iop32x vendored
View File

@ -1410,7 +1410,6 @@ CONFIG_VIDEO_BUF=m
CONFIG_VIDEO_BTCX=m
CONFIG_VIDEO_IR=m
CONFIG_VIDEO_TVEEPROM=m
CONFIG_USB_DABUSB=m
#
# Graphics support
@ -1684,7 +1683,6 @@ CONFIG_USB_EZUSB=y
#
# USB Miscellaneous drivers
#
CONFIG_USB_EMI26=m
# CONFIG_USB_AUERSWALD is not set
# CONFIG_USB_RIO500 is not set
# CONFIG_USB_LEGOTOWER is not set

1
debian/arch/arm/config.ixp4xx vendored
View File

@ -1681,7 +1681,6 @@ CONFIG_USB_EZUSB=y
#
# USB Miscellaneous drivers
#
CONFIG_USB_EMI26=m
CONFIG_USB_AUERSWALD=m
CONFIG_USB_RIO500=m
CONFIG_USB_LEGOTOWER=m

49
debian/arch/config vendored
View File

@ -585,7 +585,6 @@ CONFIG_DETECT_SOFTLOCKUP=y
CONFIG_SENSORS_W83792D=m
CONFIG_IP_NF_NETBIOS_NS=m
CONFIG_NORTEL_HERMES=m
CONFIG_USB_EMI26=m
CONFIG_CONNECTOR=m
CONFIG_CICADA_PHY=m
CONFIG_QSEMI_PHY=m
@ -794,7 +793,6 @@ CONFIG_GIGASET_M105=m
CONFIG_NET_WIRELESS_RTNETLINK=y
CONFIG_ISDN_DRV_GIGASET=m
CONFIG_BCM43XX=m
CONFIG_USB_DABUSB=m
CONFIG_TOIM3232_DONGLE=m
CONFIG_DVB_ZL10353=m
CONFIG_BCM43XX_DMA_AND_PIO_MODE=y
@ -863,7 +861,6 @@ CONFIG_VIDEO_ZORAN_AVS6EYES=m
CONFIG_INET_XFRM_MODE_TUNNEL=m
# CONFIG_USB_PWC_DEBUG is not set
CONFIG_SND_INDIGOIO=m
CONFIG_USB_SERIAL_KEYSPAN_PDA=m
# CONFIG_MTD_NAND_ECC_SMC is not set
CONFIG_IP_NF_NAT_SIP=m
# CONFIG_W1_SLAVE_DS2433_CRC is not set
@ -877,10 +874,8 @@ CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
CONFIG_JFFS2_FS_SECURITY=y
CONFIG_SENSORS_LM70=m
CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
CONFIG_JFFS2_FS_POSIX_ACL=y
# CONFIG_RT_MUTEX_TESTER is not set
CONFIG_USB_EMI62=m
CONFIG_RTC_DRV_DS1553=m
CONFIG_NETWORK_SECMARK=y
CONFIG_PC8736x_GPIO=m
@ -893,12 +888,9 @@ CONFIG_RTC_DRV_RS5C348=m
CONFIG_RTC_DRV_PCF8583=m
# CONFIG_TASKSTATS is not set
CONFIG_RTC_DRV_MAX6902=m
CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
CONFIG_BACKLIGHT_DEVICE=y
CONFIG_USB_CYPRESS_CY7C63=m
CONFIG_TCP_CONG_VENO=m
CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
CONFIG_VIDEO_PVRUSB2_24XXX=y
CONFIG_NET_DMA=y
# CONFIG_CIFS_DEBUG2 is not set
@ -911,8 +903,6 @@ CONFIG_RT_MUTEXES=y
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_RTC_DRV_V3020=m
CONFIG_INFINIBAND_ADDR_TRANS=y
CONFIG_USB_SERIAL_KEYSPAN_USA28=y
CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
CONFIG_ACPI_DOCK=m
CONFIG_SENSORS_SMSC47M192=m
CONFIG_USB_APPLEDISPLAY=m
@ -926,16 +916,12 @@ CONFIG_RTC_DRV_DS1742=m
CONFIG_MYRI10GE=m
CONFIG_ZD1211RW=m
CONFIG_USB_QUICKCAM_MESSENGER=m
CONFIG_DGRS=m
CONFIG_OCFS2_DEBUG_MASKLOG=y
CONFIG_USB_SERIAL_KEYSPAN=m
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
CONFIG_SND_GINA20=m
CONFIG_VITESSE_PHY=m
CONFIG_INET6_XFRM_MODE_TRANSPORT=m
CONFIG_SND_GINA24=m
CONFIG_USB_SERIAL_KEYSPAN_USA19=y
CONFIG_USB_SERIAL_KEYSPAN_MPR=y
CONFIG_VIDEO_TLV320AIC23B=m
CONFIG_USB_SERIAL_SIERRAWIRELESS=m
CONFIG_VIDEO_CX2341X=m
@ -957,14 +943,12 @@ CONFIG_MCS_FIR=m
# CONFIG_IPW2200_PROMISCUOUS is not set
CONFIG_INET6_XFRM_MODE_TUNNEL=m
CONFIG_SCSI_HPTIOP=m
CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
CONFIG_VIDEO_PVRUSB2_SYSFS=y
# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
CONFIG_MD_RAID456=m
CONFIG_INFINIBAND_ISER=m
CONFIG_NETFILTER_XT_MATCH_QUOTA=m
CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
CONFIG_DVB_LNBP21=m
CONFIG_NETFILTER_XT_TARGET_SECMARK=m
CONFIG_STACKTRACE_SUPPORT=y
@ -973,13 +957,11 @@ CONFIG_JFFS2_FS_XATTR=y
CONFIG_PARPORT_AX88796=m
CONFIG_SND_INDIGODJ=m
CONFIG_SENSORS_ABITUGURU=m
CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
CONFIG_SND_ECHO3G=m
# CONFIG_FB_INTEL_DEBUG is not set
CONFIG_SND_LAYLA20=m
# CONFIG_SYS_HYPERVISOR is not set
CONFIG_SND_LAYLA24=m
CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
CONFIG_LCD_DEVICE=y
CONFIG_FIXED_PHY=m
CONFIG_SND_MONA=m
@ -997,7 +979,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=m
CONFIG_VIDEO_V4L1_COMPAT=y
CONFIG_MTD_NAND_CS553X=m
CONFIG_LEDS_NET48XX=m
CONFIG_SMCTR=m
CONFIG_EARLY_PRINTK=y
CONFIG_SERIAL_8250_PCI=y
CONFIG_SERIAL_8250_PNP=y
@ -1056,11 +1037,6 @@ CONFIG_SATA_VIA=m
CONFIG_SATA_VITESSE=m
CONFIG_SATA_INTEL_COMBINED=y
# CONFIG_SCSI_IPR is not set
CONFIG_PATA_OPTIDMA=m
CONFIG_PATA_CS5520=m
CONFIG_PATA_CMD64X=m
CONFIG_PATA_CYPRESS=m
CONFIG_CRYPTO_BLKCIPHER=m
CONFIG_MICROCODE_OLD_INTERFACE=y
CONFIG_PCNET32_NAPI=y
@ -1088,7 +1064,6 @@ CONFIG_VIDEO_SAA7111=m
CONFIG_VIDEO_SAA7114=m
# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
CONFIG_SYSCTL_SYSCALL=y
CONFIG_PATA_RZ1000=m
# CONFIG_DEBUG_LIST is not set
CONFIG_CRYPTO_MANAGER=y
CONFIG_KEYBOARD_STOWAWAY=m
@ -1097,11 +1072,9 @@ CONFIG_USB_U132_HCD=m
CONFIG_DVB_TUA6100=m
CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
CONFIG_SCSI_AIC94XX=m
CONFIG_PATA_SIS=m
CONFIG_ECRYPT_FS=m
CONFIG_SND_MTS64=m
CONFIG_NETFILTER_XT_TARGET_DSCP=m
CONFIG_PATA_NETCELL=m
CONFIG_SCSI_SAS_LIBSAS=m
CONFIG_VIDEO_BT856=m
CONFIG_SMSC37B787_WDT=m
@ -1110,7 +1083,6 @@ CONFIG_INET_XFRM_MODE_BEET=m
# CONFIG_UTS_NS is not set
CONFIG_VIDEO_ADV7170=m
CONFIG_PATA_PCMCIA=m
CONFIG_PATA_NS87410=m
CONFIG_VIDEO_ADV7175=m
# CONFIG_JBD2_DEBUG is not set
CONFIG_MMC_TIFM_SD=m
@ -1119,20 +1091,14 @@ CONFIG_USB_SERIAL_AIRCABLE=m
# CONFIG_NETLABEL is not set
CONFIG_INPUT_FF_MEMLESS=m
CONFIG_PATA_PDC_OLD=m
CONFIG_PATA_MPIIX=m
CONFIG_EXT4DEV_FS_SECURITY=y
CONFIG_PATA_SERVERWORKS=m
CONFIG_PATA_PDC2027X=m
CONFIG_EXT4DEV_FS_XATTR=y
CONFIG_USB_SERIAL_MOS7720=m
CONFIG_VIDEO_KS0127=m
CONFIG_BLK_DEV_JMICRON=m
CONFIG_PATA_OLDPIIX=m
# CONFIG_IPV6_MIP6 is not set
# CONFIG_DEFAULT_CUBIC is not set
CONFIG_PATA_RADISYS=m
CONFIG_PATA_ARTOP=m
CONFIG_PATA_HPT3X3=m
# CONFIG_DM_DEBUG is not set
# CONFIG_IPC_NS is not set
# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
@ -1141,28 +1107,22 @@ CONFIG_USB_ADUTUX=m
CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_ECB=m
CONFIG_SND_AC97_POWER_SAVE=y
CONFIG_PATA_IT821X=m
CONFIG_PATA_WINBOND=m
CONFIG_JBD2=m
CONFIG_SSFDC=m
CONFIG_BLOCK=y
CONFIG_DEFAULT_BIC=y
CONFIG_PATA_SC1200=m
CONFIG_CRYPTO_CBC=m
CONFIG_PATA_SIL680=m
CONFIG_TOUCHSCREEN_PENMOUNT=m
CONFIG_VIDEO_TDA9840=m
CONFIG_PATA_ATIIXP=m
CONFIG_GFS2_FS_LOCKING_NOLOCK=m
CONFIG_SCSI_NETLINK=y
CONFIG_USB_PHIDGET=m
CONFIG_PATA_EFAR=m
CONFIG_USB_SERIAL_MOS7840=m
CONFIG_PATA_HPT37X=m
CONFIG_VIDEO_TVAUDIO=m
# CONFIG_CC_STACKPROTECTOR is not set
CONFIG_VIDEO_TDA7432=m
CONFIG_PATA_HPT3X2N=m
CONFIG_ASUS_LAPTOP=m
CONFIG_MSI_LAPTOP=m
CONFIG_SONY_LAPTOP=m
@ -1175,32 +1135,26 @@ CONFIG_ZONE_DMA32=y
CONFIG_TIFM_7XX1=m
CONFIG_DVB_TDA826X=m
CONFIG_VIDEO_PVRUSB2_29XXX=y
CONFIG_PATA_HPT366=m
CONFIG_CRYPTO_ALGAPI=y
CONFIG_NET_PKTGEN=m
CONFIG_VIDEO_VPX3220=m
CONFIG_PROC_SYSCTL=y
CONFIG_PATA_AMD=m
CONFIG_VIDEO_TEA6415C=m
CONFIG_USB_TOUCHSCREEN_GUNZE=y
CONFIG_USB_STORAGE_KARMA=y
CONFIG_DVB_CORE_ATTACH=y
CONFIG_ATA_GENERIC=m
CONFIG_PATA_OPTI=m
# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
CONFIG_NETFILTER_XT_MATCH_DSCP=m
CONFIG_DVB_USB_DIB0700=m
CONFIG_PATA_TRIFLEX=m
# CONFIG_DEFAULT_WESTWOOD is not set
CONFIG_SCSI_QLA_ISCSI=m
CONFIG_USB_USBNET_MII=m
# CONFIG_IP_DCCP_CCID2_DEBUG is not set
CONFIG_W83697HF_WDT=m
CONFIG_SLHC=m
CONFIG_PATA_CS5530=m
CONFIG_DLM_DEBUG=y
CONFIG_GENERIC_ACL=y
CONFIG_PATA_VIA=m
CONFIG_DVB_TDA10086=m
CONFIG_DLM=m
# CONFIG_DVB_FE_CUSTOMISE is not set
@ -1213,8 +1167,6 @@ CONFIG_ENABLE_MUST_CHECK=y
CONFIG_DVB_TUNER_QT1010=m
CONFIG_DVB_TUNER_MT2060=m
CONFIG_INET6_XFRM_MODE_BEET=m
CONFIG_PATA_ALI=m
CONFIG_PATA_JMICRON=m
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
CONFIG_TOUCHSCREEN_TOUCHWIN=m
CONFIG_USB_TRANCEVIBRATOR=m
@ -1232,7 +1184,6 @@ CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
CONFIG_HOTPLUG_PCI_CPCI=y
CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
CONFIG_PATA_LEGACY=m
CONFIG_PATA_CS5535=m
CONFIG_AUDIT_GENERIC=y
CONFIG_PATA_QDI=m
CONFIG_PATA_ISAPNP=m

4
debian/arch/hppa/config vendored
View File

@ -301,13 +301,13 @@ CONFIG_ULTRA=m
CONFIG_ULTRA32=m
CONFIG_SMC9194=m
CONFIG_NET_VENDOR_RACAL=y
CONFIG_NI52=m
# CONFIG_NI52 is not set
# CONFIG_NI65 is not set
CONFIG_NET_TULIP=y
# CONFIG_DE2104X is not set
CONFIG_TULIP=m
# CONFIG_TULIP_MWI is not set
# CONFIG_TULIP_MMIO is not set
CONFIG_TULIP_MMIO=y
# CONFIG_DE4X5 is not set
# CONFIG_WINBOND_840 is not set
# CONFIG_DM9102 is not set

4
debian/arch/i386/config vendored
View File

@ -444,9 +444,6 @@ CONFIG_IPX=m
# CONFIG_IPX_INTERN is not set
CONFIG_ATALK=m
CONFIG_LTPC=m
CONFIG_COPS=m
CONFIG_COPS_DAYNA=y
CONFIG_COPS_TANGENT=y
CONFIG_IPDDP=m
CONFIG_IPDDP_ENCAP=y
CONFIG_IPDDP_DECAP=y
@ -652,7 +649,6 @@ CONFIG_TR=y
CONFIG_IBMTR=m
CONFIG_IBMOL=m
CONFIG_IBMLS=m
CONFIG_3C359=m
CONFIG_TMS380TR=m
CONFIG_TMSPCI=m
CONFIG_SKISA=m

1
debian/arch/powerpc/config vendored
View File

@ -435,7 +435,6 @@ CONFIG_S2IO=m
CONFIG_TR=y
CONFIG_IBMOL=m
CONFIG_IBMLS=m
CONFIG_3C359=m
CONFIG_TMS380TR=m
CONFIG_TMSPCI=m
CONFIG_ABYSS=m

10
debian/bin/abiupdate.py vendored
View File

@ -38,14 +38,14 @@ class main(object):
self.override_subarch = subarch
self.override_flavour = flavour
changelog = read_changelog()
while changelog[0]['Distribution'] == 'UNRELEASED':
changelog = Changelog(version = VersionLinux)
while changelog[0].distribution == 'UNRELEASED':
changelog.pop(0)
changelog = changelog[0]
self.source = changelog['Source']
self.version = changelog['Version']['linux']['version']
self.version_source = changelog['Version']['linux']['source']
self.source = changelog.source
self.version = changelog.version.linux_version
self.version_source = changelog.version.complete
local_config = config_reader_arch(["debian/arch"])

60
debian/changelog vendored
View File

@ -1,8 +1,5 @@
linux-2.6 (2.6.21~rc7-1~experimental.1) UNRELEASED; urgency=low
[ Bastian Blank ]
*
[ maximilian attems ]
* Disable CONFIG_IP_ROUTE_MULTIPATH_CACHED in topconfig.
* Enable CONFIG_IP6_NF_MATCH_MH, CONFIG_CHELSIO_T3, CONFIG_USB_NET_DM9601,
@ -16,11 +13,62 @@ linux-2.6 (2.6.21~rc7-1~experimental.1) UNRELEASED; urgency=low
-- maximilian attems <maks@debian.org> Tue, 10 Apr 2007 14:42:30 +0200
linux-2.6 (2.6.20-2) UNRELEASED; urgency=low
linux-2.6 (2.6.20-3) UNRELEASED; urgency=low
* Rename linux-libc-headers into linux-libc-dev.
[ Gordon Farquharson ]
* arm: Mark CONFIG_MTD_NAND_CAFE and CONFIG_NETXEN_NIC as broken to
fix FTBFS.
-- Bastian Blank <waldi@debian.org> Mon, 09 Apr 2007 22:37:22 +0200
[ Bastian Blank ]
* Disable new pata drivers. (closes: #419458)
* Disable pata in ata_piix.
-- Bastian Blank <waldi@debian.org> Tue, 24 Apr 2007 08:01:54 +0200
linux-2.6 (2.6.20-2) unstable; urgency=low
[ Bastian Blank ]
* Rename linux-libc-headers into linux-libc-dev.
* [mips] Drop sb1250 uart support.
* [alpha] Temporary disable alpha images.
* Add stable release 2.6.20.7:
- Linux 2.6.20.7
- Update libata drive blacklist to the latest from 2.6.21
- fix page leak during core dump
- revert "retries in ext4_prepare_write() violate ordering requirements"
- revert "retries in ext3_prepare_write() violate ordering requirements"
- libata: Clear tf before doing request sense (take 3)
- fix lba48 bug in libata fill_result_tf()
- ahci.c: walkaround for SB600 SATA internal error issue
- libata bugfix: preserve LBA bit for HDIO_DRIVE_TASK
- softmac: avoid assert in ieee80211softmac_wx_get_rate
- knfsd: allow nfsd READDIR to return 64bit cookies
- Fix TCP slow_start_after_idle sysctl
- Fix tcindex classifier ABI borkage...
- Fix IPSEC replay window handling
- Fix TCP receiver side SWS handling.
- Fix scsi sense handling
- Fix length validation in rawv6_sendmsg()
- NETFILTER: ipt_CLUSTERIP: fix oops in checkentry function
- 8139too: RTNL and flush_scheduled_work deadlock
- Fix calculation for size of filemap_attr array in md/bitmap.
- HID: Do not discard truncated input reports
- DVB: pluto2: fix incorrect TSCR register setting
- DVB: tda10086: fix DiSEqC message length
- sky2: phy workarounds for Yukon EC-U A1
- sky2: turn on clocks when doing resume
- sky2: turn carrier off when down
- skge: turn carrier off when down
- sky2: reliable recovery
- i386: fix file_read_actor() and pipe_read() for original i386 systems
- kbuild: fix dependency generation
[ dann frazier ]
* [hppa] Add parisc arch patch from Kyle McMartin
* [hppa] Enable CONFIG_TULIP_MMIO (closes: #332962)
* [hppa] Disable ni52 driver, it doesn't build (and wouldn't work if it did)
-- Bastian Blank <waldi@debian.org> Sun, 15 Apr 2007 16:04:16 +0200
linux-2.6 (2.6.20-1) unstable; urgency=low

51
debian/patches/debian/drivers-ata-ata_piix-postpone-pata.patch vendored Normal file
View File

@ -0,0 +1,51 @@
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 57c0db3..1d1052d 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -164,46 +164,6 @@ static void ich_set_dmamode (struct ata_port *ap, struct ata_device *adev);
static unsigned int in_module_init = 1;
static const struct pci_device_id piix_pci_tbl[] = {
-#ifdef ATA_ENABLE_PATA
- /* Intel PIIX4 for the 430TX/440BX/MX chipset: UDMA 33 */
- /* Also PIIX4E (fn3 rev 2) and PIIX4M (fn3 rev 3) */
- { 0x8086, 0x7111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 },
- { 0x8086, 0x24db, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
- { 0x8086, 0x25a2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
- /* Intel PIIX4 */
- { 0x8086, 0x7199, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 },
- /* Intel PIIX4 */
- { 0x8086, 0x7601, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 },
- /* Intel PIIX */
- { 0x8086, 0x84CA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 },
- /* Intel ICH (i810, i815, i840) UDMA 66*/
- { 0x8086, 0x2411, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_66 },
- /* Intel ICH0 : UDMA 33*/
- { 0x8086, 0x2421, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_33 },
- /* Intel ICH2M */
- { 0x8086, 0x244A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
- /* Intel ICH2 (i810E2, i845, 850, 860) UDMA 100 */
- { 0x8086, 0x244B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
- /* Intel ICH3M */
- { 0x8086, 0x248A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
- /* Intel ICH3 (E7500/1) UDMA 100 */
- { 0x8086, 0x248B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
- /* Intel ICH4 (i845GV, i845E, i852, i855) UDMA 100 */
- { 0x8086, 0x24CA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
- { 0x8086, 0x24CB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
- /* Intel ICH5 */
- { 0x8086, 0x24DB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_133 },
- /* C-ICH (i810E2) */
- { 0x8086, 0x245B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
- /* ESB (855GME/875P + 6300ESB) UDMA 100 */
- { 0x8086, 0x25A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
- /* ICH6 (and 6) (i915) UDMA 100 */
- { 0x8086, 0x266F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
- /* ICH7/7-R (i945, i975) UDMA 100*/
- { 0x8086, 0x27DF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_133 },
- { 0x8086, 0x269E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
-#endif
-
/* NOTE: The following PCI ids must be kept in sync with the
* list in drivers/pci/quirks.c.
*/