From c4df5a2df00dbcddea5ca134faa57fc6f0115d94 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Thu, 7 Jun 2012 09:02:23 +0100 Subject: [PATCH 11/34] UBUNTU: [Config] highbank -- commonise CONFIG_ATALK Signed-off-by: Andy Whitcroft --- debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/armel/config.common.armel | 1 - debian.master/config/armhf/config.flavour.highbank | 1 - debian.master/config/armhf/config.flavour.omap | 1 - debian.master/config/config.common.ubuntu | 1 + debian.master/config/i386/config.common.i386 | 1 - debian.master/config/powerpc/config.common.powerpc | 1 - debian.master/config/ppc64/config.common.ppc64 | 1 - 8 files changed, 1 insertion(+), 7 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 41ff229..4f4f3d8 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -18,7 +18,6 @@ CONFIG_ASUS_OLED=m CONFIG_ASYNC_RAID6_TEST=m # CONFIG_ASYNC_TX_DMA is not set CONFIG_AT76C50X_USB=m -CONFIG_ATALK=m CONFIG_ATARI_PARTITION=y CONFIG_ATA_GENERIC=y # CONFIG_ATA_NONSTANDARD is not set diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 6403096..ca47579 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -18,7 +18,6 @@ CONFIG_ASUS_OLED=m CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_TX_DMA=y CONFIG_AT76C50X_USB=m -CONFIG_ATALK=m CONFIG_ATARI_PARTITION=y # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATH_COMMON=m diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank index 456e864..4d9feb3 100644 --- a/debian.master/config/armhf/config.flavour.highbank +++ b/debian.master/config/armhf/config.flavour.highbank @@ -14,7 +14,6 @@ CONFIG_ARM_L1_CACHE_SHIFT=5 # CONFIG_ASYNC_RAID6_TEST is not set # CONFIG_ASYNC_TX_DMA is not set # CONFIG_AT76C50X_USB is not set -# CONFIG_ATALK is not set # CONFIG_ATARI_PARTITION is not set # CONFIG_ATH_COMMON is not set # CONFIG_AUXDISPLAY is not set diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap index 7804443..b78e25c 100644 --- a/debian.master/config/armhf/config.flavour.omap +++ b/debian.master/config/armhf/config.flavour.omap @@ -14,7 +14,6 @@ CONFIG_ASUS_OLED=m CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_TX_DMA=y CONFIG_AT76C50X_USB=m -CONFIG_ATALK=m CONFIG_ATARI_PARTITION=y CONFIG_ATH_COMMON=m CONFIG_AUXDISPLAY=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index e867587..325f734 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -355,6 +355,7 @@ CONFIG_ASYNC_XOR=m CONFIG_AT1700=m CONFIG_ATA=y CONFIG_ATAGS_PROC=y +CONFIG_ATALK=m CONFIG_ATA_ACPI=y CONFIG_ATA_BMDMA=y CONFIG_ATA_OVER_ETH=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 2aa916c..dddb6c2 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -15,7 +15,6 @@ CONFIG_ASUS_OLED=m CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_TX_DMA=y CONFIG_AT76C50X_USB=m -CONFIG_ATALK=m CONFIG_ATARI_PARTITION=y CONFIG_ATA_GENERIC=y # CONFIG_ATA_NONSTANDARD is not set diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 9a258b3..e454acd 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -14,7 +14,6 @@ CONFIG_ASUS_OLED=m CONFIG_ASYNC_RAID6_TEST=m # CONFIG_ASYNC_TX_DMA is not set CONFIG_AT76C50X_USB=m -CONFIG_ATALK=m CONFIG_ATARI_PARTITION=y CONFIG_ATA_GENERIC=m CONFIG_ATA_PIIX=m diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index aaeb5cc..74cae28 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -16,7 +16,6 @@ CONFIG_ASUS_OLED=m CONFIG_ASYNC_RAID6_TEST=m # CONFIG_ASYNC_TX_DMA is not set CONFIG_AT76C50X_USB=m -CONFIG_ATALK=m CONFIG_ATARI_PARTITION=y CONFIG_ATA_GENERIC=m CONFIG_ATA_NONSTANDARD=y -- 1.7.9.5