unify settings of misc usb input devices
where enabled in topconfig previously, reenable them kill references to old config variables see ba0acb5ee318901646f82c134cca2e4de0c43934 svn path=/dists/trunk/linux-2.6/; revision=8725
This commit is contained in:
parent
db94e09248
commit
31a3d56903
|
@ -1312,9 +1312,7 @@ CONFIG_USB_HIDINPUT=y
|
|||
CONFIG_USB_HIDDEV=y
|
||||
CONFIG_USB_KBD=m
|
||||
CONFIG_USB_MOUSE=m
|
||||
CONFIG_USB_POWERMATE=m
|
||||
CONFIG_USB_XPAD=m
|
||||
CONFIG_USB_ATI_REMOTE=m
|
||||
CONFIG_USB_MDC800=m
|
||||
CONFIG_USB_MICROTEK=m
|
||||
CONFIG_USB_VICAM=m
|
||||
|
|
|
@ -1167,9 +1167,7 @@ CONFIG_USB_HIDINPUT_POWERBOOK=y
|
|||
CONFIG_USB_HIDDEV=y
|
||||
CONFIG_USB_KBD=m
|
||||
CONFIG_USB_MOUSE=m
|
||||
CONFIG_USB_POWERMATE=m
|
||||
CONFIG_USB_XPAD=m
|
||||
CONFIG_USB_ATI_REMOTE=m
|
||||
CONFIG_USB_MDC800=m
|
||||
CONFIG_USB_MICROTEK=m
|
||||
CONFIG_USB_VICAM=m
|
||||
|
|
|
@ -1336,11 +1336,7 @@ CONFIG_USB_HIDINPUT=y
|
|||
#
|
||||
CONFIG_USB_KBD=m
|
||||
CONFIG_USB_MOUSE=m
|
||||
# CONFIG_USB_POWERMATE is not set
|
||||
CONFIG_USB_YEALINK=m
|
||||
# CONFIG_USB_XPAD is not set
|
||||
# CONFIG_USB_ATI_REMOTE is not set
|
||||
CONFIG_USB_KEYSPAN_REMOTE=m
|
||||
# CONFIG_USB_APPLETOUCH is not set
|
||||
|
||||
#
|
||||
|
|
|
@ -972,7 +972,6 @@ CONFIG_TABLET_USB_GTCO=m
|
|||
CONFIG_TABLET_USB_KBTAB=m
|
||||
CONFIG_TABLET_USB_WACOM=m
|
||||
# CONFIG_INPUT_TOUCHSCREEN is not set
|
||||
CONFIG_INPUT_MISC=y
|
||||
CONFIG_INPUT_UINPUT=m
|
||||
|
||||
#
|
||||
|
@ -1563,12 +1562,7 @@ CONFIG_USB_HIDDEV=y
|
|||
#
|
||||
# CONFIG_USB_KBD is not set
|
||||
# CONFIG_USB_MOUSE is not set
|
||||
CONFIG_USB_POWERMATE=m
|
||||
# CONFIG_USB_YEALINK is not set
|
||||
CONFIG_USB_XPAD=m
|
||||
CONFIG_USB_ATI_REMOTE=m
|
||||
CONFIG_USB_ATI_REMOTE2=m
|
||||
# CONFIG_USB_KEYSPAN_REMOTE is not set
|
||||
CONFIG_USB_APPLETOUCH=m
|
||||
|
||||
#
|
||||
|
|
|
@ -1569,12 +1569,7 @@ CONFIG_USB_HIDDEV=y
|
|||
#
|
||||
# CONFIG_USB_KBD is not set
|
||||
# CONFIG_USB_MOUSE is not set
|
||||
CONFIG_USB_POWERMATE=m
|
||||
CONFIG_USB_YEALINK=m
|
||||
CONFIG_USB_XPAD=m
|
||||
CONFIG_USB_ATI_REMOTE=m
|
||||
CONFIG_USB_ATI_REMOTE2=m
|
||||
CONFIG_USB_KEYSPAN_REMOTE=m
|
||||
CONFIG_USB_APPLETOUCH=m
|
||||
|
||||
#
|
||||
|
|
|
@ -243,7 +243,6 @@ CONFIG_BLK_DEV_IT821X=m
|
|||
# CONFIG_BLK_DEV_JMICRON is not set
|
||||
CONFIG_TEXTSEARCH=y
|
||||
CONFIG_DRM_VIA=m
|
||||
CONFIG_USB_KEYSPAN_REMOTE=m
|
||||
CONFIG_DVB_S5H1420=m
|
||||
CONFIG_SND_HDSPM=m
|
||||
# CONFIG_HWMON_DEBUG_CHIP is not set
|
||||
|
@ -683,7 +682,6 @@ CONFIG_LXT_PHY=m
|
|||
CONFIG_PCMCIA_SPECTRUM=m
|
||||
CONFIG_HOSTAP_PCI=m
|
||||
CONFIG_USB_NET_AX8817X=m
|
||||
CONFIG_USB_YEALINK=m
|
||||
CONFIG_FUSE_FS=m
|
||||
CONFIG_IEEE80211_CRYPT_CCMP=m
|
||||
CONFIG_FB_CYBLA=m
|
||||
|
@ -819,7 +817,11 @@ CONFIG_NETFILTER_XT_MATCH_COMMENT=m
|
|||
CONFIG_MTD_M25P80=m
|
||||
CONFIG_NETFILTER_XT_MATCH_STRING=m
|
||||
CONFIG_YENTA_TOSHIBA=y
|
||||
CONFIG_USB_ATI_REMOTE2=m
|
||||
CONFIG_INPUT_ATI_REMOTE=m
|
||||
CONFIG_INPUT_ATI_REMOTE2=m
|
||||
CONFIG_INPUT_KEYSPAN_REMOTE=m
|
||||
CONFIG_INPUT_POWERMATE=m
|
||||
CONFIG_INPUT_YEALINK=m
|
||||
CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
|
||||
CONFIG_SECURITY_NETWORK_XFRM=y
|
||||
CONFIG_NETFILTER_XT_MATCH_LIMIT=m
|
||||
|
|
|
@ -651,7 +651,6 @@ CONFIG_USB_HIDDEV=y
|
|||
CONFIG_USB_KBD=m
|
||||
CONFIG_USB_MOUSE=m
|
||||
# CONFIG_USB_XPAD is not set
|
||||
# CONFIG_USB_ATI_REMOTE is not set
|
||||
# CONFIG_USB_MDC800 is not set
|
||||
# CONFIG_USB_MICROTEK is not set
|
||||
# CONFIG_USB_CATC is not set
|
||||
|
|
|
@ -1417,9 +1417,7 @@ CONFIG_USB_HIDINPUT_POWERBOOK=y
|
|||
CONFIG_USB_HIDDEV=y
|
||||
CONFIG_USB_KBD=m
|
||||
CONFIG_USB_MOUSE=m
|
||||
CONFIG_USB_POWERMATE=m
|
||||
CONFIG_USB_XPAD=m
|
||||
CONFIG_USB_ATI_REMOTE=m
|
||||
CONFIG_USB_APPLETOUCH=m
|
||||
CONFIG_USB_MDC800=m
|
||||
CONFIG_USB_MICROTEK=m
|
||||
|
|
|
@ -1013,9 +1013,7 @@ CONFIG_HID_FF=y
|
|||
CONFIG_USB_HIDDEV=y
|
||||
CONFIG_USB_KBD=m
|
||||
CONFIG_USB_MOUSE=m
|
||||
CONFIG_USB_POWERMATE=m
|
||||
CONFIG_USB_XPAD=m
|
||||
CONFIG_USB_ATI_REMOTE=m
|
||||
CONFIG_USB_MDC800=m
|
||||
CONFIG_USB_MICROTEK=m
|
||||
CONFIG_USB_VICAM=m
|
||||
|
|
|
@ -2540,12 +2540,7 @@ CONFIG_USB_HIDDEV=y
|
|||
#
|
||||
CONFIG_USB_KBD=m
|
||||
CONFIG_USB_MOUSE=m
|
||||
CONFIG_USB_POWERMATE=m
|
||||
CONFIG_USB_YEALINK=m
|
||||
CONFIG_USB_XPAD=m
|
||||
CONFIG_USB_ATI_REMOTE=m
|
||||
CONFIG_USB_ATI_REMOTE2=m
|
||||
CONFIG_USB_KEYSPAN_REMOTE=m
|
||||
CONFIG_USB_APPLETOUCH=m
|
||||
|
||||
#
|
||||
|
|
|
@ -1382,12 +1382,7 @@ CONFIG_USB_HIDDEV=y
|
|||
#
|
||||
# CONFIG_USB_KBD is not set
|
||||
# CONFIG_USB_MOUSE is not set
|
||||
# CONFIG_USB_POWERMATE is not set
|
||||
# CONFIG_USB_YEALINK is not set
|
||||
# CONFIG_USB_XPAD is not set
|
||||
# CONFIG_USB_ATI_REMOTE is not set
|
||||
CONFIG_USB_ATI_REMOTE2=m
|
||||
# CONFIG_USB_KEYSPAN_REMOTE is not set
|
||||
# CONFIG_USB_APPLETOUCH is not set
|
||||
|
||||
#
|
||||
|
|
|
@ -1378,12 +1378,7 @@ CONFIG_USB_HIDDEV=y
|
|||
#
|
||||
# CONFIG_USB_KBD is not set
|
||||
# CONFIG_USB_MOUSE is not set
|
||||
# CONFIG_USB_POWERMATE is not set
|
||||
# CONFIG_USB_YEALINK is not set
|
||||
# CONFIG_USB_XPAD is not set
|
||||
# CONFIG_USB_ATI_REMOTE is not set
|
||||
CONFIG_USB_ATI_REMOTE2=m
|
||||
# CONFIG_USB_KEYSPAN_REMOTE is not set
|
||||
# CONFIG_USB_APPLETOUCH is not set
|
||||
|
||||
#
|
||||
|
|
|
@ -2540,12 +2540,7 @@ CONFIG_USB_HIDDEV=y
|
|||
#
|
||||
CONFIG_USB_KBD=m
|
||||
CONFIG_USB_MOUSE=m
|
||||
CONFIG_USB_POWERMATE=m
|
||||
CONFIG_USB_YEALINK=m
|
||||
CONFIG_USB_XPAD=m
|
||||
CONFIG_USB_ATI_REMOTE=m
|
||||
CONFIG_USB_ATI_REMOTE2=m
|
||||
CONFIG_USB_KEYSPAN_REMOTE=m
|
||||
CONFIG_USB_APPLETOUCH=m
|
||||
|
||||
#
|
||||
|
|
|
@ -899,7 +899,6 @@ CONFIG_MOUSE_PS2=m
|
|||
# CONFIG_INPUT_TOUCHSCREEN is not set
|
||||
CONFIG_INPUT_MISC=y
|
||||
# CONFIG_INPUT_PCSPKR is not set
|
||||
CONFIG_INPUT_UINPUT=m
|
||||
|
||||
#
|
||||
# Hardware I/O ports
|
||||
|
@ -1219,12 +1218,7 @@ CONFIG_USB_STORAGE_ALAUDA=y
|
|||
#
|
||||
# CONFIG_USB_KBD is not set
|
||||
# CONFIG_USB_MOUSE is not set
|
||||
# CONFIG_USB_POWERMATE is not set
|
||||
# CONFIG_USB_YEALINK is not set
|
||||
# CONFIG_USB_XPAD is not set
|
||||
# CONFIG_USB_ATI_REMOTE is not set
|
||||
CONFIG_USB_ATI_REMOTE2=m
|
||||
# CONFIG_USB_KEYSPAN_REMOTE is not set
|
||||
# CONFIG_USB_APPLETOUCH is not set
|
||||
|
||||
#
|
||||
|
|
|
@ -1382,12 +1382,7 @@ CONFIG_USB_HIDDEV=y
|
|||
#
|
||||
# CONFIG_USB_KBD is not set
|
||||
# CONFIG_USB_MOUSE is not set
|
||||
# CONFIG_USB_POWERMATE is not set
|
||||
# CONFIG_USB_YEALINK is not set
|
||||
# CONFIG_USB_XPAD is not set
|
||||
# CONFIG_USB_ATI_REMOTE is not set
|
||||
CONFIG_USB_ATI_REMOTE2=m
|
||||
# CONFIG_USB_KEYSPAN_REMOTE is not set
|
||||
# CONFIG_USB_APPLETOUCH is not set
|
||||
|
||||
#
|
||||
|
|
|
@ -1378,12 +1378,7 @@ CONFIG_USB_HIDDEV=y
|
|||
#
|
||||
# CONFIG_USB_KBD is not set
|
||||
# CONFIG_USB_MOUSE is not set
|
||||
# CONFIG_USB_POWERMATE is not set
|
||||
# CONFIG_USB_YEALINK is not set
|
||||
# CONFIG_USB_XPAD is not set
|
||||
# CONFIG_USB_ATI_REMOTE is not set
|
||||
CONFIG_USB_ATI_REMOTE2=m
|
||||
# CONFIG_USB_KEYSPAN_REMOTE is not set
|
||||
# CONFIG_USB_APPLETOUCH is not set
|
||||
|
||||
#
|
||||
|
|
|
@ -988,9 +988,7 @@ CONFIG_THRUSTMASTER_FF=y
|
|||
CONFIG_USB_HIDDEV=y
|
||||
# CONFIG_USB_KBD is not set
|
||||
# CONFIG_USB_MOUSE is not set
|
||||
CONFIG_USB_POWERMATE=m
|
||||
CONFIG_USB_XPAD=m
|
||||
CONFIG_USB_ATI_REMOTE=m
|
||||
CONFIG_USB_MDC800=m
|
||||
CONFIG_USB_MICROTEK=m
|
||||
CONFIG_USB_VICAM=m
|
||||
|
|
|
@ -47,7 +47,6 @@ CONFIG_MOUSE_SERIAL=y
|
|||
CONFIG_OBP_FLASH=m
|
||||
CONFIG_FB_PM2=y
|
||||
# CONFIG_I2C_VIAPRO is not set
|
||||
CONFIG_USB_ATI_REMOTE=m
|
||||
CONFIG_USB_OHCI_HCD=m
|
||||
CONFIG_IXGB=m
|
||||
CONFIG_SCSI_SYM53C8XX_2=m
|
||||
|
@ -211,7 +210,6 @@ CONFIG_SND_SEQ_DUMMY=m
|
|||
# CONFIG_I2C_DEBUG_CHIP is not set
|
||||
# CONFIG_USB_TEST is not set
|
||||
# CONFIG_USB_ACM is not set
|
||||
# CONFIG_USB_POWERMATE is not set
|
||||
CONFIG_FC4_SOCAL=m
|
||||
CONFIG_VIA_VELOCITY=m
|
||||
# CONFIG_VIDEO_CQCAM is not set
|
||||
|
|
|
@ -47,7 +47,6 @@ CONFIG_MOUSE_SERIAL=y
|
|||
CONFIG_OBP_FLASH=m
|
||||
CONFIG_FB_PM2=y
|
||||
# CONFIG_I2C_VIAPRO is not set
|
||||
CONFIG_USB_ATI_REMOTE=m
|
||||
CONFIG_USB_OHCI_HCD=m
|
||||
CONFIG_IXGB=m
|
||||
CONFIG_SCSI_SYM53C8XX_2=m
|
||||
|
@ -210,7 +209,6 @@ CONFIG_SND_SEQ_DUMMY=m
|
|||
# CONFIG_I2C_DEBUG_CHIP is not set
|
||||
# CONFIG_USB_TEST is not set
|
||||
# CONFIG_USB_ACM is not set
|
||||
# CONFIG_USB_POWERMATE is not set
|
||||
CONFIG_FC4_SOCAL=m
|
||||
CONFIG_VIA_VELOCITY=m
|
||||
# CONFIG_VIDEO_CQCAM is not set
|
||||
|
|
Loading…
Reference in New Issue