diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-04-29 07:36:43 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-04-29 07:36:43 +0000 |
| commit | e96d52d198511789d66d8fb7bd9a0f3c3c9c0107 (patch) | |
| tree | a91c5c6dbd1ccf52974ba5063918e1c171ebeb1a /target/linux/adm5120/patches-3.3/a10-pata-rb150-cf-3.3-fix.patch | |
| parent | 19be4923e0a2dfa6dd173288fc0ead976a0f2b38 (diff) | |
| download | upstream-e96d52d198511789d66d8fb7bd9a0f3c3c9c0107.tar.gz upstream-e96d52d198511789d66d8fb7bd9a0f3c3c9c0107.tar.bz2 upstream-e96d52d198511789d66d8fb7bd9a0f3c3c9c0107.zip | |
adm5120: merge 3.3 patches
SVN-Revision: 31511
Diffstat (limited to 'target/linux/adm5120/patches-3.3/a10-pata-rb150-cf-3.3-fix.patch')
| -rw-r--r-- | target/linux/adm5120/patches-3.3/a10-pata-rb150-cf-3.3-fix.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/target/linux/adm5120/patches-3.3/a10-pata-rb150-cf-3.3-fix.patch b/target/linux/adm5120/patches-3.3/a10-pata-rb150-cf-3.3-fix.patch deleted file mode 100644 index fc3257a73c..0000000000 --- a/target/linux/adm5120/patches-3.3/a10-pata-rb150-cf-3.3-fix.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/drivers/ata/pata_rb153_cf.c -+++ b/drivers/ata/pata_rb153_cf.c -@@ -56,7 +56,7 @@ static inline void rb153_pata_finish_io( - ata_sff_dma_pause(ap); - ndelay(RB153_CF_IO_DELAY); - -- set_irq_type(info->irq, IRQ_TYPE_LEVEL_HIGH); -+ irq_set_irq_type(info->irq, IRQ_TYPE_LEVEL_HIGH); - } - - static void rb153_pata_exec_command(struct ata_port *ap, -@@ -107,11 +107,11 @@ static irqreturn_t rb153_pata_irq_handle - struct rb153_cf_info *info = ah->private_data; - - if (gpio_get_value(info->gpio_line)) { -- set_irq_type(info->irq, IRQ_TYPE_LEVEL_LOW); -+ irq_set_irq_type(info->irq, IRQ_TYPE_LEVEL_LOW); - if (!info->frozen) - ata_sff_interrupt(irq, dev_instance); - } else { -- set_irq_type(info->irq, IRQ_TYPE_LEVEL_HIGH); -+ irq_set_irq_type(info->irq, IRQ_TYPE_LEVEL_HIGH); - } - - return IRQ_HANDLED; -@@ -138,7 +138,6 @@ static void rb153_pata_setup_port(struct - - ap->ops = &rb153_pata_port_ops; - ap->pio_mask = 0x1f; /* PIO4 */ -- ap->flags = ATA_FLAG_NO_LEGACY | ATA_FLAG_MMIO; - - ap->ioaddr.cmd_addr = info->iobase + RB153_CF_REG_CMD; - ap->ioaddr.ctl_addr = info->iobase + RB153_CF_REG_CTRL; |