diff options
Diffstat (limited to 'target/linux')
7 files changed, 50 insertions, 185 deletions
diff --git a/target/linux/ar71xx/patches-3.6/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.6/610-MIPS-ath79-openwrt-machines.patch index eba0cbd..1425f71 100644 --- a/target/linux/ar71xx/patches-3.6/610-MIPS-ath79-openwrt-machines.patch +++ b/target/linux/ar71xx/patches-3.6/610-MIPS-ath79-openwrt-machines.patch @@ -1,6 +1,6 @@ --- a/arch/mips/ath79/machtypes.h +++ b/arch/mips/ath79/machtypes.h -@@ -16,20 +16,104 @@ +@@ -16,20 +16,110 @@ enum ath79_mach_type { ATH79_MACH_GENERIC = 0, @@ -17,6 +17,7 @@ + ATH79_MACH_AP83, /* Atheros AP83 */ + ATH79_MACH_AP96, /* Atheros AP96 */ + ATH79_MACH_AW_NR580, /* AzureWave AW-NR580 */ ++ ATH79_MACH_CAP4200AG, /* Senao CAP4200AG */ ATH79_MACH_DB120, /* Atheros DB120 reference board */ ATH79_MACH_PB44, /* Atheros PB44 reference board */ + ATH79_MACH_DIR_600_A1, /* D-Link DIR-600 rev. A1 */ @@ -30,6 +31,7 @@ + ATH79_MACH_JA76PF2, /* jjPlus JA76PF2 */ + ATH79_MACH_JWAP003, /* jjPlus JWAP003 */ + ATH79_MACH_HORNET_UB, /* ALFA Networks Hornet-UB */ ++ ATH79_MACH_MR600, /* OpenMesh MR600 */ + ATH79_MACH_MZK_W04NU, /* Planex MZK-W04NU */ + ATH79_MACH_MZK_W300NH, /* Planex MZK-W300NH */ + ATH79_MACH_NBG460N, /* Zyxel NBG460N/550N/550NH */ @@ -42,6 +44,7 @@ + ATH79_MACH_RB_411U, /* MikroTik RouterBOARD 411U */ + ATH79_MACH_RB_433, /* MikroTik RouterBOARD 433/433AH */ + ATH79_MACH_RB_433U, /* MikroTik RouterBOARD 433UAH */ ++ ATH79_MACH_RB_435G, /* MikroTik RouterBOARD 435G */ + ATH79_MACH_RB_450G, /* MikroTik RouterBOARD 450G */ + ATH79_MACH_RB_450, /* MikroTik RouterBOARD 450 */ + ATH79_MACH_RB_493, /* Mikrotik RouterBOARD 493/493AH */ @@ -60,7 +63,9 @@ + ATH79_MACH_TL_MR3020, /* TP-LINK TL-MR3020 */ + ATH79_MACH_TL_MR3040, /* TP-LINK TL-MR3040 */ + ATH79_MACH_TL_MR3220, /* TP-LINK TL-MR3220 */ ++ ATH79_MACH_TL_MR3220_V2, /* TP-LINK TL-MR3220 v2 */ + ATH79_MACH_TL_MR3420, /* TP-LINK TL-MR3420 */ ++ ATH79_MACH_TL_WA7510N_V1, /* TP-LINK TL-WA7510N v1*/ + ATH79_MACH_TL_WA901ND, /* TP-LINK TL-WA901ND */ + ATH79_MACH_TL_WA901ND_V2, /* TP-LINK TL-WA901ND v2 */ + ATH79_MACH_TL_WDR4300, /* TP-LINK TL-WDR4300 */ @@ -91,6 +96,7 @@ + ATH79_MACH_WHR_HP_GN, /* Buffalo WHR-HP-GN */ + ATH79_MACH_WLAE_AG300N, /* Buffalo WLAE-AG300N */ + ATH79_MACH_WNDR3700, /* NETGEAR WNDR3700/WNDR3800/WNDRMAC */ ++ ATH79_MACH_WNDR4300, /* NETGEAR WNDR4300 */ + ATH79_MACH_WNR2000, /* NETGEAR WNR2000 */ + ATH79_MACH_WP543, /* Compex WP543 */ + ATH79_MACH_WPE72, /* Compex WPE72 */ @@ -208,7 +214,7 @@ config ATH79_MACH_PB44 bool "Atheros PB44 reference board" select SOC_AR71XX -@@ -67,6 +147,456 @@ config ATH79_MACH_PB44 +@@ -67,6 +147,488 @@ config ATH79_MACH_PB44 Say 'Y' here if you want your kernel to support the Atheros PB44 reference board. @@ -419,6 +425,17 @@ + select ATH79_DEV_M25P80 + select ATH79_DEV_USB + ++config ATH79_MACH_WNDR4300 ++ bool "NETGEAR WNDR4300 board support" ++ select SOC_AR934X ++ select ATH79_DEV_AP9X_PCI if PCI ++ select ATH79_DEV_ETH ++ select ATH79_DEV_GPIO_BUTTONS ++ select ATH79_DEV_LEDS_GPIO ++ select ATH79_DEV_NFC ++ select ATH79_DEV_USB ++ select ATH79_DEV_WMAC ++ +config ATH79_MACH_WNR2000 + bool "NETGEAR WNR2000 board support" + select SOC_AR913X @@ -439,6 +456,16 @@ + select ATH79_DEV_M25P80 + select ATH79_DEV_WMAC + ++config ATH79_MACH_MR600 ++ bool "OpenMesh MR600 board support" ++ select SOC_AR934X ++ select ATH79_DEV_AP9X_PCI if PCI ++ select ATH79_DEV_ETH ++ select ATH79_DEV_GPIO_BUTTONS ++ select ATH79_DEV_LEDS_GPIO ++ select ATH79_DEV_M25P80 ++ select ATH79_DEV_WMAC ++ +config ATH79_MACH_MZK_W04NU + bool "Planex MZK-W04NU board support" + select SOC_AR913X @@ -468,6 +495,16 @@ + select ATH79_DEV_M25P80 + select ATH79_DEV_USB + ++config ATH79_MACH_CAP4200AG ++ bool "Senao CAP4200AG support" ++ select SOC_AR934X ++ select ATH79_DEV_AP9X_PCI if PCI ++ select ATH79_DEV_ETH ++ select ATH79_DEV_GPIO_BUTTONS ++ select ATH79_DEV_LEDS_GPIO ++ select ATH79_DEV_M25P80 ++ select ATH79_DEV_WMAC ++ +config ATH79_MACH_EAP7660D + bool "Senao EAP7660D support" + select SOC_AR71XX @@ -507,7 +544,7 @@ + select ATH79_DEV_USB + +config ATH79_MACH_TL_WA901ND -+ bool "TP-LINK TL-WA901ND support" ++ bool "TP-LINK TL-WA901ND/TL-WA7510N support" + select SOC_AR724X + select ATH79_DEV_AP9X_PCI if PCI + select ATH79_DEV_ETH @@ -555,12 +592,13 @@ + select ATH79_DEV_M25P80 + +config ATH79_MACH_TL_WR741ND_V4 -+ bool "TP-LINK TL-WR741ND v4 support" ++ bool "TP-LINK TL-WR741ND v4/TL-MR3220 v2 support" + select SOC_AR933X + select ATH79_DEV_ETH + select ATH79_DEV_GPIO_BUTTONS + select ATH79_DEV_LEDS_GPIO + select ATH79_DEV_M25P80 ++ select ATH79_DEV_USB + select ATH79_DEV_WMAC + +config ATH79_MACH_TL_WR841N_V1 @@ -665,7 +703,7 @@ config ATH79_MACH_UBNT_XM bool "Ubiquiti Networks XM/UniFi boards" select SOC_AR724X -@@ -82,6 +612,24 @@ config ATH79_MACH_UBNT_XM +@@ -82,6 +644,24 @@ config ATH79_MACH_UBNT_XM Say 'Y' here if you want your kernel to support the Ubiquiti Networks XM (rev 1.0) board. @@ -690,7 +728,7 @@ endmenu config SOC_AR71XX -@@ -117,10 +665,6 @@ config SOC_QCA955X +@@ -117,10 +697,6 @@ config SOC_QCA955X select PCI_AR724X if PCI def_bool n @@ -701,7 +739,7 @@ config ATH79_DEV_AP9X_PCI select ATH79_PCI_ATH9K_FIXUP def_bool n -@@ -131,7 +675,14 @@ config ATH79_DEV_DSA +@@ -131,7 +707,14 @@ config ATH79_DEV_DSA config ATH79_DEV_ETH def_bool n @@ -717,7 +755,7 @@ def_bool n config ATH79_DEV_GPIO_BUTTONS -@@ -163,4 +714,7 @@ config ATH79_PCI_ATH9K_FIXUP +@@ -163,4 +746,7 @@ config ATH79_PCI_ATH9K_FIXUP config ATH79_ROUTERBOOT def_bool n @@ -727,7 +765,7 @@ endif --- a/arch/mips/ath79/Makefile +++ b/arch/mips/ath79/Makefile -@@ -38,9 +38,68 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route +@@ -38,9 +38,71 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route # # Machines # @@ -742,6 +780,7 @@ +obj-$(CONFIG_ATH79_MACH_AP83) += mach-ap83.o +obj-$(CONFIG_ATH79_MACH_AP96) += mach-ap96.o +obj-$(CONFIG_ATH79_MACH_AW_NR580) += mach-aw-nr580.o ++obj-$(CONFIG_ATH79_MACH_CAP4200AG) += mach-cap4200ag.o obj-$(CONFIG_ATH79_MACH_DB120) += mach-db120.o +obj-$(CONFIG_ATH79_MACH_DIR_600_A1) += mach-dir-600-a1.o +obj-$(CONFIG_ATH79_MACH_DIR_615_C1) += mach-dir-615-c1.o @@ -751,6 +790,7 @@ +obj-$(CONFIG_ATH79_MACH_JA76PF) += mach-ja76pf.o +obj-$(CONFIG_ATH79_MACH_JWAP003) += mach-jwap003.o +obj-$(CONFIG_ATH79_MACH_HORNET_UB) += mach-hornet-ub.o ++obj-$(CONFIG_ATH79_MACH_MR600) += mach-mr600.o +obj-$(CONFIG_ATH79_MACH_MZK_W04NU) += mach-mzk-w04nu.o +obj-$(CONFIG_ATH79_MACH_MZK_W300NH) += mach-mzk-w300nh.o +obj-$(CONFIG_ATH79_MACH_NBG460N) += mach-nbg460n.o @@ -785,6 +825,7 @@ +obj-$(CONFIG_ATH79_MACH_WHR_HP_G300N) += mach-whr-hp-g300n.o +obj-$(CONFIG_ATH79_MACH_WLAE_AG300N) += mach-wlae-ag300n.o +obj-$(CONFIG_ATH79_MACH_WNDR3700) += mach-wndr3700.o ++obj-$(CONFIG_ATH79_MACH_WNDR4300) += mach-wndr4300.o +obj-$(CONFIG_ATH79_MACH_WNR2000) += mach-wnr2000.o +obj-$(CONFIG_ATH79_MACH_WP543) += mach-wp543.o +obj-$(CONFIG_ATH79_MACH_WPE72) += mach-wpe72.o diff --git a/target/linux/ar71xx/patches-3.6/611-MIPS-ath79-CAP4200AG-support.patch b/target/linux/ar71xx/patches-3.6/611-MIPS-ath79-CAP4200AG-support.patch deleted file mode 100644 index 39cef42..0000000 --- a/target/linux/ar71xx/patches-3.6/611-MIPS-ath79-CAP4200AG-support.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/arch/mips/ath79/Kconfig -+++ b/arch/mips/ath79/Kconfig -@@ -403,6 +403,16 @@ config ATH79_MACH_RW2458N - select ATH79_DEV_M25P80 - select ATH79_DEV_USB - -+config ATH79_MACH_CAP4200AG -+ bool "Senao CAP4200AG support" -+ select SOC_AR934X -+ select ATH79_DEV_AP9X_PCI if PCI -+ select ATH79_DEV_ETH -+ select ATH79_DEV_GPIO_BUTTONS -+ select ATH79_DEV_LEDS_GPIO -+ select ATH79_DEV_M25P80 -+ select ATH79_DEV_WMAC -+ - config ATH79_MACH_EAP7660D - bool "Senao EAP7660D support" - select SOC_AR71XX ---- a/arch/mips/ath79/machtypes.h -+++ b/arch/mips/ath79/machtypes.h -@@ -29,6 +29,7 @@ enum ath79_mach_type { - ATH79_MACH_AP83, /* Atheros AP83 */ - ATH79_MACH_AP96, /* Atheros AP96 */ - ATH79_MACH_AW_NR580, /* AzureWave AW-NR580 */ -+ ATH79_MACH_CAP4200AG, /* Senao CAP4200AG */ - ATH79_MACH_DB120, /* Atheros DB120 reference board */ - ATH79_MACH_PB44, /* Atheros PB44 reference board */ - ATH79_MACH_DIR_600_A1, /* D-Link DIR-600 rev. A1 */ ---- a/arch/mips/ath79/Makefile -+++ b/arch/mips/ath79/Makefile -@@ -49,6 +49,7 @@ obj-$(CONFIG_ATH79_MACH_AP81) += mach-a - obj-$(CONFIG_ATH79_MACH_AP83) += mach-ap83.o - obj-$(CONFIG_ATH79_MACH_AP96) += mach-ap96.o - obj-$(CONFIG_ATH79_MACH_AW_NR580) += mach-aw-nr580.o -+obj-$(CONFIG_ATH79_MACH_CAP4200AG) += mach-cap4200ag.o - obj-$(CONFIG_ATH79_MACH_DB120) += mach-db120.o - obj-$(CONFIG_ATH79_MACH_DIR_600_A1) += mach-dir-600-a1.o - obj-$(CONFIG_ATH79_MACH_DIR_615_C1) += mach-dir-615-c1.o diff --git a/target/linux/ar71xx/patches-3.6/612-MIPS-ath79-TL-WA7510N-v1-support.patch b/target/linux/ar71xx/patches-3.6/612-MIPS-ath79-TL-WA7510N-v1-support.patch deleted file mode 100644 index 6bd58b0..0000000 --- a/target/linux/ar71xx/patches-3.6/612-MIPS-ath79-TL-WA7510N-v1-support.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/arch/mips/ath79/machtypes.h -+++ b/arch/mips/ath79/machtypes.h -@@ -74,6 +74,7 @@ enum ath79_mach_type { - ATH79_MACH_TL_MR3040, /* TP-LINK TL-MR3040 */ - ATH79_MACH_TL_MR3220, /* TP-LINK TL-MR3220 */ - ATH79_MACH_TL_MR3420, /* TP-LINK TL-MR3420 */ -+ ATH79_MACH_TL_WA7510N_V1, /* TP-LINK TL-WA7510N v1*/ - ATH79_MACH_TL_WA901ND, /* TP-LINK TL-WA901ND */ - ATH79_MACH_TL_WA901ND_V2, /* TP-LINK TL-WA901ND v2 */ - ATH79_MACH_TL_WDR4300, /* TP-LINK TL-WDR4300 */ ---- a/arch/mips/ath79/Kconfig -+++ b/arch/mips/ath79/Kconfig -@@ -452,7 +452,7 @@ config ATH79_MACH_TL_MR3X20 - select ATH79_DEV_USB - - config ATH79_MACH_TL_WA901ND -- bool "TP-LINK TL-WA901ND support" -+ bool "TP-LINK TL-WA901ND/TL-WA7510N support" - select SOC_AR724X - select ATH79_DEV_AP9X_PCI if PCI - select ATH79_DEV_ETH diff --git a/target/linux/ar71xx/patches-3.6/614-MIPS-ath79-MR600-support.patch b/target/linux/ar71xx/patches-3.6/614-MIPS-ath79-MR600-support.patch deleted file mode 100644 index f56fd74..0000000 --- a/target/linux/ar71xx/patches-3.6/614-MIPS-ath79-MR600-support.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/arch/mips/ath79/Kconfig -+++ b/arch/mips/ath79/Kconfig -@@ -374,6 +374,16 @@ config ATH79_MACH_OM2P - select ATH79_DEV_M25P80 - select ATH79_DEV_WMAC - -+config ATH79_MACH_MR600 -+ bool "OpenMesh MR600 board support" -+ select SOC_AR934X -+ select ATH79_DEV_AP9X_PCI if PCI -+ select ATH79_DEV_ETH -+ select ATH79_DEV_GPIO_BUTTONS -+ select ATH79_DEV_LEDS_GPIO -+ select ATH79_DEV_M25P80 -+ select ATH79_DEV_WMAC -+ - config ATH79_MACH_MZK_W04NU - bool "Planex MZK-W04NU board support" - select SOC_AR913X ---- a/arch/mips/ath79/machtypes.h -+++ b/arch/mips/ath79/machtypes.h -@@ -43,6 +43,7 @@ enum ath79_mach_type { - ATH79_MACH_JA76PF2, /* jjPlus JA76PF2 */ - ATH79_MACH_JWAP003, /* jjPlus JWAP003 */ - ATH79_MACH_HORNET_UB, /* ALFA Networks Hornet-UB */ -+ ATH79_MACH_MR600, /* OpenMesh MR600 */ - ATH79_MACH_MZK_W04NU, /* Planex MZK-W04NU */ - ATH79_MACH_MZK_W300NH, /* Planex MZK-W300NH */ - ATH79_MACH_NBG460N, /* Zyxel NBG460N/550N/550NH */ ---- a/arch/mips/ath79/Makefile -+++ b/arch/mips/ath79/Makefile -@@ -59,6 +59,7 @@ obj-$(CONFIG_ATH79_MACH_EAP7660D) += mac - obj-$(CONFIG_ATH79_MACH_JA76PF) += mach-ja76pf.o - obj-$(CONFIG_ATH79_MACH_JWAP003) += mach-jwap003.o - obj-$(CONFIG_ATH79_MACH_HORNET_UB) += mach-hornet-ub.o -+obj-$(CONFIG_ATH79_MACH_MR600) += mach-mr600.o - obj-$(CONFIG_ATH79_MACH_MZK_W04NU) += mach-mzk-w04nu.o - obj-$(CONFIG_ATH79_MACH_MZK_W300NH) += mach-mzk-w300nh.o - obj-$(CONFIG_ATH79_MACH_NBG460N) += mach-nbg460n.o diff --git a/target/linux/ar71xx/patches-3.6/615-MIPS-ath79-RB435G-support.patch b/target/linux/ar71xx/patches-3.6/615-MIPS-ath79-RB435G-support.patch deleted file mode 100644 index 5921417..0000000 --- a/target/linux/ar71xx/patches-3.6/615-MIPS-ath79-RB435G-support.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/arch/mips/ath79/machtypes.h -+++ b/arch/mips/ath79/machtypes.h -@@ -56,6 +56,7 @@ enum ath79_mach_type { - ATH79_MACH_RB_411U, /* MikroTik RouterBOARD 411U */ - ATH79_MACH_RB_433, /* MikroTik RouterBOARD 433/433AH */ - ATH79_MACH_RB_433U, /* MikroTik RouterBOARD 433UAH */ -+ ATH79_MACH_RB_435G, /* MikroTik RouterBOARD 435G */ - ATH79_MACH_RB_450G, /* MikroTik RouterBOARD 450G */ - ATH79_MACH_RB_450, /* MikroTik RouterBOARD 450 */ - ATH79_MACH_RB_493, /* Mikrotik RouterBOARD 493/493AH */ diff --git a/target/linux/ar71xx/patches-3.6/616-MIPS-ath79-WNDR4300-support.patch b/target/linux/ar71xx/patches-3.6/616-MIPS-ath79-WNDR4300-support.patch deleted file mode 100644 index 055708b..0000000 --- a/target/linux/ar71xx/patches-3.6/616-MIPS-ath79-WNDR4300-support.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/arch/mips/ath79/Kconfig -+++ b/arch/mips/ath79/Kconfig -@@ -354,6 +354,17 @@ config ATH79_MACH_WNDR3700 - select ATH79_DEV_M25P80 - select ATH79_DEV_USB - -+config ATH79_MACH_WNDR4300 -+ bool "NETGEAR WNDR4300 board support" -+ select SOC_AR934X -+ select ATH79_DEV_AP9X_PCI if PCI -+ select ATH79_DEV_ETH -+ select ATH79_DEV_GPIO_BUTTONS -+ select ATH79_DEV_LEDS_GPIO -+ select ATH79_DEV_NFC -+ select ATH79_DEV_USB -+ select ATH79_DEV_WMAC -+ - config ATH79_MACH_WNR2000 - bool "NETGEAR WNR2000 board support" - select SOC_AR913X ---- a/arch/mips/ath79/machtypes.h -+++ b/arch/mips/ath79/machtypes.h -@@ -107,6 +107,7 @@ enum ath79_mach_type { - ATH79_MACH_WHR_HP_GN, /* Buffalo WHR-HP-GN */ - ATH79_MACH_WLAE_AG300N, /* Buffalo WLAE-AG300N */ - ATH79_MACH_WNDR3700, /* NETGEAR WNDR3700/WNDR3800/WNDRMAC */ -+ ATH79_MACH_WNDR4300, /* NETGEAR WNDR4300 */ - ATH79_MACH_WNR2000, /* NETGEAR WNR2000 */ - ATH79_MACH_WP543, /* Compex WP543 */ - ATH79_MACH_WPE72, /* Compex WPE72 */ ---- a/arch/mips/ath79/Makefile -+++ b/arch/mips/ath79/Makefile -@@ -94,6 +94,7 @@ obj-$(CONFIG_ATH79_MACH_UBNT_XM) += mach - obj-$(CONFIG_ATH79_MACH_WHR_HP_G300N) += mach-whr-hp-g300n.o - obj-$(CONFIG_ATH79_MACH_WLAE_AG300N) += mach-wlae-ag300n.o - obj-$(CONFIG_ATH79_MACH_WNDR3700) += mach-wndr3700.o -+obj-$(CONFIG_ATH79_MACH_WNDR4300) += mach-wndr4300.o - obj-$(CONFIG_ATH79_MACH_WNR2000) += mach-wnr2000.o - obj-$(CONFIG_ATH79_MACH_WP543) += mach-wp543.o - obj-$(CONFIG_ATH79_MACH_WPE72) += mach-wpe72.o diff --git a/target/linux/ar71xx/patches-3.6/617-MIPS-ath79-TL-MR3220-v2-support.patch b/target/linux/ar71xx/patches-3.6/617-MIPS-ath79-TL-MR3220-v2-support.patch deleted file mode 100644 index 92c9d24..0000000 --- a/target/linux/ar71xx/patches-3.6/617-MIPS-ath79-TL-MR3220-v2-support.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/arch/mips/ath79/Kconfig -+++ b/arch/mips/ath79/Kconfig -@@ -521,12 +521,13 @@ config ATH79_MACH_TL_WR741ND - select ATH79_DEV_M25P80 - - config ATH79_MACH_TL_WR741ND_V4 -- bool "TP-LINK TL-WR741ND v4 support" -+ bool "TP-LINK TL-WR741ND v4/TL-MR3220 v2 support" - select SOC_AR933X - select ATH79_DEV_ETH - select ATH79_DEV_GPIO_BUTTONS - select ATH79_DEV_LEDS_GPIO - select ATH79_DEV_M25P80 -+ select ATH79_DEV_USB - select ATH79_DEV_WMAC - - config ATH79_MACH_TL_WR841N_V1 ---- a/arch/mips/ath79/machtypes.h -+++ b/arch/mips/ath79/machtypes.h -@@ -75,6 +75,7 @@ enum ath79_mach_type { - ATH79_MACH_TL_MR3020, /* TP-LINK TL-MR3020 */ - ATH79_MACH_TL_MR3040, /* TP-LINK TL-MR3040 */ - ATH79_MACH_TL_MR3220, /* TP-LINK TL-MR3220 */ -+ ATH79_MACH_TL_MR3220_V2, /* TP-LINK TL-MR3220 v2 */ - ATH79_MACH_TL_MR3420, /* TP-LINK TL-MR3420 */ - ATH79_MACH_TL_WA7510N_V1, /* TP-LINK TL-WA7510N v1*/ - ATH79_MACH_TL_WA901ND, /* TP-LINK TL-WA901ND */ |