summaryrefslogtreecommitdiff
path: root/packages/linux/nas100d-kernel/2.6.15/60-nas100d-ide.patch
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2005-11-21 07:42:32 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-11-21 07:42:32 +0000
commit94d14ff9e7623337ece7bcafa4c373949ed78c19 (patch)
treec4ac4ee935f915f0e48173bcce7277dfbf24402e /packages/linux/nas100d-kernel/2.6.15/60-nas100d-ide.patch
parentc3036f11360cf4992c635dcdc43f1d703b004cac (diff)
nas100d-kernel: Updated for 2.6.15-rc2
Diffstat (limited to 'packages/linux/nas100d-kernel/2.6.15/60-nas100d-ide.patch')
-rw-r--r--packages/linux/nas100d-kernel/2.6.15/60-nas100d-ide.patch18
1 files changed, 0 insertions, 18 deletions
diff --git a/packages/linux/nas100d-kernel/2.6.15/60-nas100d-ide.patch b/packages/linux/nas100d-kernel/2.6.15/60-nas100d-ide.patch
index afd7d9c750..fea83fbec7 100644
--- a/packages/linux/nas100d-kernel/2.6.15/60-nas100d-ide.patch
+++ b/packages/linux/nas100d-kernel/2.6.15/60-nas100d-ide.patch
@@ -39,24 +39,6 @@
(void) aec62xx_tune_chipset(drive, speed);
return ide_dma_enable(drive);
}
-@@ -263,7 +281,7 @@ static int aec62xx_irq_timeout (ide_driv
- case PCI_DEVICE_ID_ARTOP_ATP865:
- case PCI_DEVICE_ID_ARTOP_ATP865R:
- printk(" AEC62XX time out ");
--#if 0
-+#ifdef CONFIG_MACH_NAS100D
- {
- int i = 0;
- u8 reg49h = 0;
-@@ -277,7 +295,7 @@ static int aec62xx_irq_timeout (ide_driv
- default:
- break;
- }
--#if 0
-+#ifdef CONFIG_MACH_NAS100D
- {
- ide_hwif_t *hwif = HWIF(drive);
- struct pci_dev *dev = hwif->pci_dev;
@@ -299,6 +317,14 @@ static unsigned int __devinit init_chips
{
int bus_speed = system_bus_clock();