From 489295932d1a5c7ae20291b29c78382dffa3e9f6 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Thu, 18 Sep 2014 12:35:53 +0000 Subject: [PATCH] arm64: axe merged patch Signed-off-by: maximilian attems svn path=/dists/trunk/linux/; revision=21867 --- ...t-NET_XGENE-should-depend-on-HAS_DMA.patch | 47 ------------------- debian/patches/series | 1 - 2 files changed, 48 deletions(-) delete mode 100644 debian/patches/features/arm64/drivers-net-NET_XGENE-should-depend-on-HAS_DMA.patch diff --git a/debian/patches/features/arm64/drivers-net-NET_XGENE-should-depend-on-HAS_DMA.patch b/debian/patches/features/arm64/drivers-net-NET_XGENE-should-depend-on-HAS_DMA.patch deleted file mode 100644 index 319938e5e..000000000 --- a/debian/patches/features/arm64/drivers-net-NET_XGENE-should-depend-on-HAS_DMA.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e7af4b1e854cdf88fa37241061352fb5b99dbb7f Mon Sep 17 00:00:00 2001 -From: Geert Uytterhoeven -Date: Fri, 29 Aug 2014 18:21:41 +0200 -Subject: [PATCH 4/4] drivers: net: NET_XGENE should depend on HAS_DMA - -If NO_DMA=y: - -drivers/built-in.o: In function `xgene_enet_delete_ring': -xgene_enet_main.c:(.text+0x28755a): undefined reference to `dma_free_coherent' -drivers/built-in.o: In function `xgene_enet_setup_tx_desc': -xgene_enet_main.c:(.text+0x287774): undefined reference to `dma_map_single' -xgene_enet_main.c:(.text+0x287780): undefined reference to `dma_mapping_error' -drivers/built-in.o: In function `xgene_enet_tx_completion': -xgene_enet_main.c:(.text+0x2878e6): undefined reference to `dma_unmap_single' -drivers/built-in.o: In function `xgene_enet_refill_bufpool': -xgene_enet_main.c:(.text+0x2879d4): undefined reference to `dma_map_single' -xgene_enet_main.c:(.text+0x2879e0): undefined reference to `dma_mapping_error' -drivers/built-in.o: In function `xgene_enet_rx_frame': -xgene_enet_main.c:(.text+0x287aaa): undefined reference to `dma_unmap_single' -drivers/built-in.o: In function `xgene_enet_free_desc_ring': -xgene_enet_main.c:(.text+0x287f98): undefined reference to `dma_free_coherent' -drivers/built-in.o: In function `xgene_enet_create_desc_ring': -xgene_enet_main.c:(.text+0x28808e): undefined reference to `dma_alloc_coherent' -drivers/built-in.o: In function `xgene_enet_probe': -xgene_enet_main.c:(.text+0x2883d4): undefined reference to `dma_set_mask' -xgene_enet_main.c:(.text+0x2883ec): undefined reference to `dma_supported' - -Signed-off-by: Geert Uytterhoeven -Signed-off-by: David S. Miller ---- - drivers/net/ethernet/apm/xgene/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/net/ethernet/apm/xgene/Kconfig b/drivers/net/ethernet/apm/xgene/Kconfig -index 616dff6..f4054d24 100644 ---- a/drivers/net/ethernet/apm/xgene/Kconfig -+++ b/drivers/net/ethernet/apm/xgene/Kconfig -@@ -1,5 +1,6 @@ - config NET_XGENE - tristate "APM X-Gene SoC Ethernet Driver" -+ depends on HAS_DMA - select PHYLIB - help - This is the Ethernet driver for the on-chip ethernet interface on the --- -1.7.10.4 - diff --git a/debian/patches/series b/debian/patches/series index 2f449ea6e..2c9aa2ac6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -60,7 +60,6 @@ features/powerpc/deb-pkg-add-support-for-powerpc-little-endian.patch features/x86/x86-memtest-WARN-if-bad-RAM-found.patch features/x86/x86-make-x32-syscall-support-conditional.patch features/arm/deb-pkg-add-automatic-support-for-armhf-architecture.patch -features/arm64/drivers-net-NET_XGENE-should-depend-on-HAS_DMA.patch # Miscellaneous bug fixes bugfix/all/misc-bmp085-Enable-building-as-a-module.patch