diff options
Diffstat (limited to 'target/linux/oxnas/patches-4.1')
| -rw-r--r-- | target/linux/oxnas/patches-4.1/300-introduce-oxnas-platform.patch | 4 | ||||
| -rw-r--r-- | target/linux/oxnas/patches-4.1/999-libata-hacks.patch | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/oxnas/patches-4.1/300-introduce-oxnas-platform.patch b/target/linux/oxnas/patches-4.1/300-introduce-oxnas-platform.patch index d96633db71..3130a021e8 100644 --- a/target/linux/oxnas/patches-4.1/300-introduce-oxnas-platform.patch +++ b/target/linux/oxnas/patches-4.1/300-introduce-oxnas-platform.patch @@ -1,6 +1,6 @@ --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -599,6 +599,18 @@ config ARCH_LPC32XX +@@ -600,6 +600,18 @@ config ARCH_LPC32XX help Support for the NXP LPC32XX family of processors @@ -19,7 +19,7 @@ config ARCH_PXA bool "PXA2xx/PXA3xx-based" depends on MMU -@@ -897,6 +909,8 @@ source "arch/arm/mach-omap2/Kconfig" +@@ -898,6 +910,8 @@ source "arch/arm/mach-omap2/Kconfig" source "arch/arm/mach-orion5x/Kconfig" diff --git a/target/linux/oxnas/patches-4.1/999-libata-hacks.patch b/target/linux/oxnas/patches-4.1/999-libata-hacks.patch index 3d9ec115f6..7d6670be56 100644 --- a/target/linux/oxnas/patches-4.1/999-libata-hacks.patch +++ b/target/linux/oxnas/patches-4.1/999-libata-hacks.patch @@ -15,7 +15,7 @@ /* initialize internal qc */ /* XXX: Tag 0 is used for drivers with legacy EH as some -@@ -4796,6 +4804,9 @@ struct ata_queued_cmd *ata_qc_new_init(s +@@ -4780,6 +4788,9 @@ struct ata_queued_cmd *ata_qc_new_init(s if (unlikely(ap->pflags & ATA_PFLAG_FROZEN)) return NULL; @@ -25,7 +25,7 @@ /* libsas case */ if (ap->flags & ATA_FLAG_SAS_HOST) { tag = ata_sas_allocate_tag(ap); -@@ -4841,6 +4852,8 @@ void ata_qc_free(struct ata_queued_cmd * +@@ -4825,6 +4836,8 @@ void ata_qc_free(struct ata_queued_cmd * qc->tag = ATA_TAG_POISON; if (ap->flags & ATA_FLAG_SAS_HOST) ata_sas_free_tag(tag, ap); |