UBUNTU: [Config] highbank -- commonise HID options

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

9 files changed, 33 insertions, 211 deletions

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index b2d76339a51..442f51be8ce 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -157,35 +157,6 @@ CONFIG_HARDLOCKUP_DETECTOR=y
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_HIDRAW=y
-CONFIG_HID_ACRUX=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_GREENASIA=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PID=y
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_HID_SONY=m
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_ZEROPLUS=m
-CONFIG_HID_ZYDACRON=m
 CONFIG_HOSTAP=m
 CONFIG_HTC_I2CPLD=y
 CONFIG_HTC_PASIC3=m
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index de39d37f379..f2029111075 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -159,35 +159,6 @@ CONFIG_HAMRADIO=y
 CONFIG_HAVE_AOUT=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_HIDRAW=y
-CONFIG_HID_ACRUX=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_GREENASIA=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PID=y
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_HID_SONY=m
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_ZEROPLUS=m
-CONFIG_HID_ZYDACRON=m
 # CONFIG_HIGHMEM is not set
 CONFIG_HOSTAP=m
 CONFIG_HTC_EGPIO=y
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 0fde96d4e47..6df2841fdfb 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -26,6 +26,10 @@ CONFIG_FB_CFB_IMAGEBLIT=m
 # CONFIG_FB_DDC is not set
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_SVGALIB is not set
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FB_TILEBLITTING is not set
 # CONFIG_FIRMWARE_EDID is not set
 CONFIG_FORCE_MAX_ZONEORDER=11
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index d95bd812952..a489c509be9 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -100,10 +100,6 @@ CONFIG_EXPORTFS=m
 # CONFIG_FB_S1D13XXX is not set
 # CONFIG_FB_SM7XX is not set
 # CONFIG_FB_SMSCUFX is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_FOPS is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
 # CONFIG_FB_UDL is not set
 # CONFIG_FHANDLE is not set
 # CONFIG_FONTS is not set
@@ -126,35 +122,6 @@ CONFIG_EXPORTFS=m
 # CONFIG_GPIO_SYSFS is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_HIDRAW is not set
-# CONFIG_HID_ACRUX is not set
-# CONFIG_HID_DRAGONRISE is not set
-# CONFIG_HID_EMS_FF is not set
-# CONFIG_HID_GREENASIA is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID_HOLTEK is not set
-# CONFIG_HID_KEYTOUCH is not set
-# CONFIG_HID_LCPOWER is not set
-# CONFIG_HID_MULTITOUCH is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_ORTEK is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_PICOLCD is not set
-# CONFIG_HID_PID is not set
-# CONFIG_HID_PRIMAX is not set
-# CONFIG_HID_ROCCAT is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SMARTJOYPLUS is not set
-# CONFIG_HID_SONY is not set
-# CONFIG_HID_SPEEDLINK is not set
-# CONFIG_HID_SUNPLUS is not set
-# CONFIG_HID_THRUSTMASTER is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_HID_TWINHAN is not set
-# CONFIG_HID_UCLOGIC is not set
-# CONFIG_HID_WALTOP is not set
-# CONFIG_HID_ZEROPLUS is not set
-# CONFIG_HID_ZYDACRON is not set
 CONFIG_HIGHMEM=y
 # CONFIG_HOSTAP is not set
 # CONFIG_HTC_EGPIO is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index b6812d019a8..6e06ee2a3be 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -100,10 +100,6 @@ CONFIG_FB_MODE_HELPERS=y
 CONFIG_FB_S1D13XXX=m
 CONFIG_FB_SM7XX=m
 CONFIG_FB_SMSCUFX=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_SYS_IMAGEBLIT=m
 CONFIG_FB_UDL=m
 CONFIG_FHANDLE=y
 CONFIG_FONTS=y
@@ -126,35 +122,6 @@ CONFIG_GPIO_SX150X=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_HAMRADIO=y
 CONFIG_HIDRAW=y
-CONFIG_HID_ACRUX=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_GREENASIA=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PID=y
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_HID_SONY=m
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_ZEROPLUS=m
-CONFIG_HID_ZYDACRON=m
 # CONFIG_HIGHMEM is not set
 CONFIG_HOSTAP=m
 CONFIG_HTC_EGPIO=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 723eb1b84bc..9208f9fd561 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -1962,6 +1962,7 @@ CONFIG_HIBERNATE_CALLBACKS=y
 CONFIG_HIBERNATION=y
 CONFIG_HID=m
 CONFIG_HID_A4TECH=m
+CONFIG_HID_ACRUX=m
 CONFIG_HID_ACRUX_FF=y
 CONFIG_HID_APPLE=m
 # CONFIG_HID_BATTERY_STRENGTH is not set
@@ -1969,28 +1970,56 @@ CONFIG_HID_BELKIN=m
 CONFIG_HID_CHERRY=m
 CONFIG_HID_CHICONY=m
 CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
 CONFIG_HID_ELECOM=m
+CONFIG_HID_EMS_FF=m
 CONFIG_HID_EZKEY=m
+CONFIG_HID_GREENASIA=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_HOLTEK=m
 CONFIG_HID_HYPERV_MOUSE=m
 CONFIG_HID_KENSINGTON=m
+CONFIG_HID_KEYTOUCH=m
 CONFIG_HID_KYE=m
+CONFIG_HID_LCPOWER=m
 CONFIG_HID_LOGITECH=m
 CONFIG_HID_LOGITECH_DJ=m
 CONFIG_HID_MAGICMOUSE=m
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
 CONFIG_HID_PICOLCD_BACKLIGHT=y
 CONFIG_HID_PICOLCD_FB=y
 CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PID=y
+CONFIG_HID_PRIMAX=m
 CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_ROCCAT=m
 CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_HID_SONY=m
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_SUNPLUS=m
 CONFIG_HID_SUPPORT=y
+CONFIG_HID_THRUSTMASTER=m
 CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_UCLOGIC=m
 CONFIG_HID_WACOM=m
 CONFIG_HID_WACOM_POWER_SUPPLY=y
+CONFIG_HID_WALTOP=m
 CONFIG_HID_WIIMOTE=m
 CONFIG_HID_WIIMOTE_EXT=y
+CONFIG_HID_ZEROPLUS=m
+CONFIG_HID_ZYDACRON=m
 # CONFIG_HIGHMEM4G is not set
 CONFIG_HIGHMEM64G=y
 CONFIG_HIGHPTE=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 27ed610b002..1cb5f12874d 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -157,35 +157,6 @@ CONFIG_HAVE_AOUT=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_HIDRAW=y
-CONFIG_HID_ACRUX=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_GREENASIA=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PID=y
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_HID_SONY=m
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_ZEROPLUS=m
-CONFIG_HID_ZYDACRON=m
 CONFIG_HIGHMEM=y
 CONFIG_HOSTAP=m
 CONFIG_HTC_I2CPLD=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 42c74561bce..6b85d626ad1 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -146,35 +146,6 @@ CONFIG_HAMRADIO=y
 # CONFIG_HAVE_AOUT is not set
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_HIDRAW=y
-CONFIG_HID_ACRUX=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_GREENASIA=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PID=y
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_HID_SONY=m
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_ZEROPLUS=m
-CONFIG_HID_ZYDACRON=m
 CONFIG_HIGHMEM=y
 CONFIG_HOSTAP=m
 CONFIG_HTC_I2CPLD=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 7e691b0704a..3fca532ef39 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -157,35 +157,6 @@ CONFIG_HAMRADIO=y
 # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_HIDRAW=y
-CONFIG_HID_ACRUX=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_HID_EMS_FF=m
-CONFIG_HID_GREENASIA=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_HOLTEK=m
-CONFIG_HID_KEYTOUCH=m
-CONFIG_HID_LCPOWER=m
-CONFIG_HID_MULTITOUCH=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_ORTEK=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_PICOLCD=m
-CONFIG_HID_PID=y
-CONFIG_HID_PRIMAX=m
-CONFIG_HID_ROCCAT=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_HID_SONY=m
-CONFIG_HID_SPEEDLINK=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_UCLOGIC=m
-CONFIG_HID_WALTOP=m
-CONFIG_HID_ZEROPLUS=m
-CONFIG_HID_ZYDACRON=m
 CONFIG_HOSTAP=m
 CONFIG_HTC_I2CPLD=y
 CONFIG_HTC_PASIC3=m