From b2d95c587d070d48c1a505de17ed73eb49aa5920 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Wed, 6 Jun 2012 16:23:22 +0100 Subject: [PATCH 06/34] UBUNTU: [Config] highbank -- commonise HID options Signed-off-by: Andy Whitcroft --- debian.master/config/amd64/config.common.amd64 | 30 ----------------- debian.master/config/armel/config.common.armel | 29 ----------------- debian.master/config/armhf/config.common.armhf | 4 +++ debian.master/config/armhf/config.flavour.highbank | 34 -------------------- debian.master/config/armhf/config.flavour.omap | 33 ------------------- debian.master/config/config.common.ubuntu | 30 +++++++++++++++++ debian.master/config/i386/config.common.i386 | 30 ----------------- debian.master/config/powerpc/config.common.powerpc | 30 ----------------- debian.master/config/ppc64/config.common.ppc64 | 30 ----------------- 9 files changed, 34 insertions(+), 216 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 8beeb2a..30294cb 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -78,7 +78,6 @@ CONFIG_CRC7=m CONFIG_CRC8=m CONFIG_CRC_T10DIF=y CONFIG_CRYPTO_LZO=m -CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_RNG=y CONFIG_CUSE=m CONFIG_DAB=y @@ -178,35 +177,6 @@ CONFIG_HAVE_CPUMASK_OF_CPU_MAP=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 fe45213..c7b91ba 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -166,35 +166,6 @@ CONFIG_HARDIRQS_SW_RESEND=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 5284a17..767229c 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -27,6 +27,10 @@ CONFIG_FAT_FS=y # 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_FLATMEM_MANUAL=y diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank index 8bb6cc8..ca5c39e 100644 --- a/debian.master/config/armhf/config.flavour.highbank +++ b/debian.master/config/armhf/config.flavour.highbank @@ -61,7 +61,6 @@ CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y # CONFIG_CRC8 is not set # CONFIG_CRC_T10DIF is not set CONFIG_CRYPTO_LZO=y -CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_RNG=m # CONFIG_CUSE is not set CONFIG_DAVICOM_PHY=m @@ -100,10 +99,6 @@ CONFIG_FB_CFB_IMAGEBLIT=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 @@ -127,35 +122,6 @@ CONFIG_FB_CFB_IMAGEBLIT=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 3829acb..f489340 100644 --- a/debian.master/config/armhf/config.flavour.omap +++ b/debian.master/config/armhf/config.flavour.omap @@ -99,10 +99,6 @@ CONFIG_FB_METRONOME=m 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 187f598..d56cb89 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -1058,6 +1058,7 @@ CONFIG_CRYPTO_NULL=m CONFIG_CRYPTO_PCBC=m CONFIG_CRYPTO_PCOMP=m CONFIG_CRYPTO_PCOMP2=y +CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD256=m @@ -1855,36 +1856,65 @@ 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_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_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_ROCCAT_ARVO=m CONFIG_HID_ROCCAT_COMMON=m CONFIG_HID_ROCCAT_KONE=m CONFIG_HID_ROCCAT_KONEPLUS=m CONFIG_HID_ROCCAT_KOVAPLUS=m CONFIG_HID_ROCCAT_PYRA=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_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_ZEROPLUS=m +CONFIG_HID_ZYDACRON=m CONFIG_HIGHPTE=y CONFIG_HIGH_RES_TIMERS=y # CONFIG_HIPPI is not set diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 8079907..519699e 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -76,7 +76,6 @@ CONFIG_CRC7=m CONFIG_CRC8=m CONFIG_CRC_T10DIF=y CONFIG_CRYPTO_LZO=m -CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_RNG=y CONFIG_CUSE=m CONFIG_DAB=y @@ -178,35 +177,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 5a108df..7141994 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -70,7 +70,6 @@ CONFIG_CRC7=m CONFIG_CRC8=m CONFIG_CRC_T10DIF=y CONFIG_CRYPTO_LZO=m -CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_RNG=y CONFIG_CUSE=m # CONFIG_DAB is not set @@ -164,35 +163,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 66bb3b3..77b2cd6 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -75,7 +75,6 @@ CONFIG_CRC7=m CONFIG_CRC8=m CONFIG_CRC_T10DIF=y CONFIG_CRYPTO_LZO=m -CONFIG_CRYPTO_PCRYPT=m CONFIG_CRYPTO_RNG=y CONFIG_CUSE=m # CONFIG_DAB is not set @@ -175,35 +174,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 -- 1.7.9.5