UBUNTU: [Config] highbank -- commonise EXPORTFS/FHANDLE

Signed-off-by: Andy Whitcroft <apw@canonical.com>

8 files changed, 2 insertions, 14 deletions

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 28b18fa1d9d..4710b07175c 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -103,7 +103,6 @@ CONFIG_ENCRYPTED_KEYS=y
 CONFIG_ETHOC=m
 CONFIG_EVM=y
 CONFIG_EXPERT=y
-CONFIG_EXPORTFS=y
 CONFIG_FANOTIFY=y
 CONFIG_FAT_FS=m
 CONFIG_FB_3DFX=m
@@ -130,7 +129,6 @@ CONFIG_FB_SYS_IMAGEBLIT=m
 CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_UDL=m
 CONFIG_FB_VOODOO1=m
-CONFIG_FHANDLE=y
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FONTS is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 4098492d974..7a2f79a0fe8 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -107,7 +107,6 @@ CONFIG_ENCRYPTED_KEYS=y
 CONFIG_ETHOC=m
 CONFIG_EVM=y
 CONFIG_EXPERT=y
-CONFIG_EXPORTFS=y
 CONFIG_FANOTIFY=y
 CONFIG_FAT_FS=y
 CONFIG_FB_ARMCLCD=m
@@ -131,7 +130,6 @@ CONFIG_FB_SYS_FOPS=m
 CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FB_TILEBLITTING is not set
 CONFIG_FB_UDL=m
-CONFIG_FHANDLE=y
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FONTS=y
 CONFIG_FORCE_MAX_ZONEORDER=11
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index 0248b87f3bb..54f47f143fc 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -91,7 +91,6 @@ CONFIG_ENABLE_WARN_DEPRECATED=y
 # CONFIG_ETHOC is not set
 # CONFIG_EVM is not set
 # CONFIG_EXPERT is not set
-CONFIG_EXPORTFS=m
 # CONFIG_FANOTIFY is not set
 # CONFIG_FB_ARMCLCD is not set
 # CONFIG_FB_BROADSHEET is not set
@@ -101,7 +100,6 @@ CONFIG_EXPORTFS=m
 # CONFIG_FB_SM7XX is not set
 # CONFIG_FB_SMSCUFX is not set
 # CONFIG_FB_UDL is not set
-# CONFIG_FHANDLE is not set
 # CONFIG_FONTS is not set
 # CONFIG_FPE_NWFPE is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index cb192223344..b300a1a5258 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -91,7 +91,6 @@ CONFIG_ENCRYPTED_KEYS=y
 CONFIG_ETHOC=m
 CONFIG_EVM=y
 CONFIG_EXPERT=y
-CONFIG_EXPORTFS=y
 CONFIG_FANOTIFY=y
 CONFIG_FB_ARMCLCD=m
 CONFIG_FB_BROADSHEET=m
@@ -101,7 +100,6 @@ CONFIG_FB_S1D13XXX=m
 CONFIG_FB_SM7XX=m
 CONFIG_FB_SMSCUFX=m
 CONFIG_FB_UDL=m
-CONFIG_FHANDLE=y
 CONFIG_FONTS=y
 CONFIG_FPE_NWFPE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 39955eb49a9..a1830f95eb3 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1596,6 +1596,7 @@ CONFIG_EWRK3=m
 # CONFIG_EXOFS_DEBUG is not set
 CONFIG_EXOFS_FS=m
 CONFIG_EXPERIMENTAL=y
+CONFIG_EXPORTFS=y
 CONFIG_EXT2_FS=m
 CONFIG_EXT2_FS_POSIX_ACL=y
 CONFIG_EXT2_FS_SECURITY=y
@@ -1723,6 +1724,7 @@ CONFIG_FCOE=m
 CONFIG_FCOE_FNIC=m
 CONFIG_FDDI=y
 CONFIG_FEALNX=m
+CONFIG_FHANDLE=y
 CONFIG_FIB_RULES=y
 CONFIG_FILE_LOCKING=y
 CONFIG_FIREWIRE=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 246d8dd0208..55399c8e710 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -103,7 +103,6 @@ CONFIG_ENCRYPTED_KEYS=y
 CONFIG_ETHOC=m
 CONFIG_EVM=y
 CONFIG_EXPERT=y
-CONFIG_EXPORTFS=y
 CONFIG_FANOTIFY=y
 CONFIG_FAT_FS=m
 CONFIG_FB_3DFX=m
@@ -130,7 +129,6 @@ CONFIG_FB_SYS_IMAGEBLIT=m
 CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_UDL=m
 CONFIG_FB_VOODOO1=m
-CONFIG_FHANDLE=y
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FONTS is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index c11e8803168..165e6c1893f 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -96,7 +96,6 @@ CONFIG_ENCRYPTED_KEYS=y
 CONFIG_ETHOC=m
 CONFIG_EVM=y
 CONFIG_EXPERT=y
-CONFIG_EXPORTFS=y
 CONFIG_FANOTIFY=y
 CONFIG_FAT_FS=m
 CONFIG_FB_3DFX=y
@@ -119,7 +118,6 @@ CONFIG_FB_SVGALIB=m
 CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_UDL=m
 CONFIG_FB_VOODOO1=y
-CONFIG_FHANDLE=y
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FONTS is not set
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index a773761b568..9ee64cf0deb 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -101,7 +101,6 @@ CONFIG_ENCRYPTED_KEYS=y
 CONFIG_ETHOC=m
 CONFIG_EVM=y
 CONFIG_EXPERT=y
-CONFIG_EXPORTFS=y
 CONFIG_FANOTIFY=y
 CONFIG_FAT_FS=m
 CONFIG_FB_3DFX=y
@@ -128,7 +127,6 @@ CONFIG_FB_SYS_IMAGEBLIT=y
 CONFIG_FB_TILEBLITTING=y
 CONFIG_FB_UDL=m
 CONFIG_FB_VOODOO1=y
-CONFIG_FHANDLE=y
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FONTS is not set
 CONFIG_FORCE_MAX_ZONEORDER=9