1 From f9fb4aaaf959dc36b36a7ee1734fada2d68da15f Mon Sep 17 00:00:00 2001
2 From: popcornmix <popcornmix@gmail.com>
3 Date: Thu, 19 Jul 2012 16:00:28 +0100
4 Subject: [PATCH 034/196] config: add missing options from 3.6.y kernel
7 arch/arm/configs/bcmrpi_defconfig | 653 ++++++++++++++++++++++++++-----
8 drivers/net/wireless/ath/ath9k/hif_usb.c | 2 +
9 2 files changed, 564 insertions(+), 91 deletions(-)
11 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
12 index 6219df3..36fcd49 100644
13 --- a/arch/arm/configs/bcmrpi_defconfig
14 +++ b/arch/arm/configs/bcmrpi_defconfig
16 -CONFIG_EXPERIMENTAL=y
17 +# CONFIG_ARM_PATCH_PHYS_VIRT is not set
18 # CONFIG_LOCALVERSION_AUTO is not set
21 -CONFIG_BSD_PROCESS_ACCT=y
22 -CONFIG_BSD_PROCESS_ACCT_V3=y
26 +CONFIG_HIGH_RES_TIMERS=y
27 +CONFIG_BSD_PROCESS_ACCT=y
28 +CONFIG_BSD_PROCESS_ACCT_V3=y
30 +CONFIG_TASK_DELAY_ACCT=y
32 +CONFIG_TASK_IO_ACCOUNTING=y
34 CONFIG_IKCONFIG_PROC=y
35 CONFIG_CGROUP_FREEZER=y
36 @@ -15,22 +21,24 @@ CONFIG_RESOURCE_COUNTERS=y
39 CONFIG_SCHED_AUTOGROUP=y
41 +CONFIG_BLK_DEV_INITRD=y
43 # CONFIG_COMPAT_BRK is not set
50 CONFIG_MODULE_UNLOAD=y
52 CONFIG_MODULE_SRCVERSION_ALL=y
53 # CONFIG_BLK_DEV_BSG is not set
54 CONFIG_BLK_DEV_THROTTLING=y
55 +CONFIG_PARTITION_ADVANCED=y
56 +CONFIG_MAC_PARTITION=y
57 CONFIG_CFQ_GROUP_IOSCHED=y
60 -CONFIG_HIGH_RES_TIMERS=y
63 CONFIG_CC_STACKPROTECTOR=y
64 @@ -38,6 +46,14 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
65 CONFIG_ZBOOT_ROM_BSS=0x0
66 CONFIG_CMDLINE="dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext3 rootwait"
69 +CONFIG_CPU_FREQ_STAT=m
70 +CONFIG_CPU_FREQ_STAT_DETAILS=y
71 +CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=y
72 +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
73 +CONFIG_CPU_FREQ_GOV_USERSPACE=y
74 +CONFIG_CPU_FREQ_GOV_ONDEMAND=y
75 +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
79 @@ -52,15 +68,257 @@ CONFIG_IP_PNP=y
83 -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
84 -# CONFIG_INET_XFRM_MODE_TUNNEL is not set
85 -# CONFIG_INET_XFRM_MODE_BEET is not set
86 -# CONFIG_INET_LRO is not set
87 -# CONFIG_INET_DIAG is not set
88 -# CONFIG_IPV6 is not set
92 +CONFIG_INET_XFRM_MODE_TRANSPORT=m
93 +CONFIG_INET_XFRM_MODE_TUNNEL=m
94 +CONFIG_INET_XFRM_MODE_BEET=m
97 +CONFIG_IPV6_PRIVACY=y
100 +CONFIG_INET6_IPCOMP=m
101 +CONFIG_IPV6_MULTIPLE_TABLES=y
103 +CONFIG_NF_CONNTRACK=m
104 +CONFIG_NF_CONNTRACK_ZONES=y
105 +CONFIG_NF_CONNTRACK_EVENTS=y
106 +CONFIG_NF_CONNTRACK_TIMESTAMP=y
107 +CONFIG_NF_CT_PROTO_DCCP=m
108 +CONFIG_NF_CT_PROTO_UDPLITE=m
109 +CONFIG_NF_CONNTRACK_AMANDA=m
110 +CONFIG_NF_CONNTRACK_FTP=m
111 +CONFIG_NF_CONNTRACK_H323=m
112 +CONFIG_NF_CONNTRACK_IRC=m
113 +CONFIG_NF_CONNTRACK_NETBIOS_NS=m
114 +CONFIG_NF_CONNTRACK_SNMP=m
115 +CONFIG_NF_CONNTRACK_PPTP=m
116 +CONFIG_NF_CONNTRACK_SANE=m
117 +CONFIG_NF_CONNTRACK_SIP=m
118 +CONFIG_NF_CONNTRACK_TFTP=m
119 +CONFIG_NF_CT_NETLINK=m
120 +CONFIG_NETFILTER_TPROXY=m
121 +CONFIG_NETFILTER_XT_SET=m
122 +CONFIG_NETFILTER_XT_TARGET_AUDIT=m
123 +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
124 +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
125 +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
126 +CONFIG_NETFILTER_XT_TARGET_DSCP=m
127 +CONFIG_NETFILTER_XT_TARGET_HMARK=m
128 +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
129 +CONFIG_NETFILTER_XT_TARGET_LED=m
130 +CONFIG_NETFILTER_XT_TARGET_LOG=m
131 +CONFIG_NETFILTER_XT_TARGET_MARK=m
132 +CONFIG_NETFILTER_XT_TARGET_NFLOG=m
133 +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
134 +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
135 +CONFIG_NETFILTER_XT_TARGET_TEE=m
136 +CONFIG_NETFILTER_XT_TARGET_TPROXY=m
137 +CONFIG_NETFILTER_XT_TARGET_TRACE=m
138 +CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
139 +CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
140 +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
141 +CONFIG_NETFILTER_XT_MATCH_BPF=m
142 +CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
143 +CONFIG_NETFILTER_XT_MATCH_COMMENT=m
144 +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
145 +CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
146 +CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
147 +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
148 +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
149 +CONFIG_NETFILTER_XT_MATCH_CPU=m
150 +CONFIG_NETFILTER_XT_MATCH_DCCP=m
151 +CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
152 +CONFIG_NETFILTER_XT_MATCH_DSCP=m
153 +CONFIG_NETFILTER_XT_MATCH_ESP=m
154 +CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
155 +CONFIG_NETFILTER_XT_MATCH_HELPER=m
156 +CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
157 +CONFIG_NETFILTER_XT_MATCH_LENGTH=m
158 +CONFIG_NETFILTER_XT_MATCH_LIMIT=m
159 +CONFIG_NETFILTER_XT_MATCH_MAC=m
160 +CONFIG_NETFILTER_XT_MATCH_MARK=m
161 +CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
162 +CONFIG_NETFILTER_XT_MATCH_NFACCT=m
163 +CONFIG_NETFILTER_XT_MATCH_OSF=m
164 +CONFIG_NETFILTER_XT_MATCH_OWNER=m
165 +CONFIG_NETFILTER_XT_MATCH_POLICY=m
166 +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
167 +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
168 +CONFIG_NETFILTER_XT_MATCH_QUOTA=m
169 +CONFIG_NETFILTER_XT_MATCH_RATEEST=m
170 +CONFIG_NETFILTER_XT_MATCH_REALM=m
171 +CONFIG_NETFILTER_XT_MATCH_RECENT=m
172 +CONFIG_NETFILTER_XT_MATCH_SOCKET=m
173 +CONFIG_NETFILTER_XT_MATCH_STATE=m
174 +CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
175 +CONFIG_NETFILTER_XT_MATCH_STRING=m
176 +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
177 +CONFIG_NETFILTER_XT_MATCH_TIME=m
178 +CONFIG_NETFILTER_XT_MATCH_U32=m
180 +CONFIG_IP_SET_BITMAP_IP=m
181 +CONFIG_IP_SET_BITMAP_IPMAC=m
182 +CONFIG_IP_SET_BITMAP_PORT=m
183 +CONFIG_IP_SET_HASH_IP=m
184 +CONFIG_IP_SET_HASH_IPPORT=m
185 +CONFIG_IP_SET_HASH_IPPORTIP=m
186 +CONFIG_IP_SET_HASH_IPPORTNET=m
187 +CONFIG_IP_SET_HASH_NET=m
188 +CONFIG_IP_SET_HASH_NETPORT=m
189 +CONFIG_IP_SET_HASH_NETIFACE=m
190 +CONFIG_IP_SET_LIST_SET=m
192 +CONFIG_IP_VS_PROTO_TCP=y
193 +CONFIG_IP_VS_PROTO_UDP=y
194 +CONFIG_IP_VS_PROTO_ESP=y
195 +CONFIG_IP_VS_PROTO_AH=y
196 +CONFIG_IP_VS_PROTO_SCTP=y
202 +CONFIG_IP_VS_LBLCR=m
208 +CONFIG_IP_VS_PE_SIP=m
209 +CONFIG_NF_CONNTRACK_IPV4=m
210 +CONFIG_IP_NF_IPTABLES=m
211 +CONFIG_IP_NF_MATCH_AH=m
212 +CONFIG_IP_NF_MATCH_ECN=m
213 +CONFIG_IP_NF_MATCH_TTL=m
214 +CONFIG_IP_NF_FILTER=m
215 +CONFIG_IP_NF_TARGET_REJECT=m
216 +CONFIG_IP_NF_TARGET_ULOG=m
217 +CONFIG_NF_NAT_IPV4=m
218 +CONFIG_IP_NF_TARGET_MASQUERADE=m
219 +CONFIG_IP_NF_TARGET_NETMAP=m
220 +CONFIG_IP_NF_TARGET_REDIRECT=m
221 +CONFIG_IP_NF_MANGLE=m
222 +CONFIG_IP_NF_TARGET_ECN=m
223 +CONFIG_IP_NF_TARGET_TTL=m
225 +CONFIG_IP_NF_ARPTABLES=m
226 +CONFIG_IP_NF_ARPFILTER=m
227 +CONFIG_IP_NF_ARP_MANGLE=m
228 +CONFIG_NF_CONNTRACK_IPV6=m
229 +CONFIG_IP6_NF_IPTABLES=m
230 +CONFIG_IP6_NF_MATCH_AH=m
231 +CONFIG_IP6_NF_MATCH_EUI64=m
232 +CONFIG_IP6_NF_MATCH_FRAG=m
233 +CONFIG_IP6_NF_MATCH_OPTS=m
234 +CONFIG_IP6_NF_MATCH_HL=m
235 +CONFIG_IP6_NF_MATCH_IPV6HEADER=m
236 +CONFIG_IP6_NF_MATCH_MH=m
237 +CONFIG_IP6_NF_MATCH_RT=m
238 +CONFIG_IP6_NF_TARGET_HL=m
239 +CONFIG_IP6_NF_FILTER=m
240 +CONFIG_IP6_NF_TARGET_REJECT=m
241 +CONFIG_IP6_NF_MANGLE=m
243 +CONFIG_NF_NAT_IPV6=m
244 +CONFIG_IP6_NF_TARGET_MASQUERADE=m
245 +CONFIG_IP6_NF_TARGET_NPT=m
246 +CONFIG_BRIDGE_NF_EBTABLES=m
247 +CONFIG_BRIDGE_EBT_BROUTE=m
248 +CONFIG_BRIDGE_EBT_T_FILTER=m
249 +CONFIG_BRIDGE_EBT_T_NAT=m
250 +CONFIG_BRIDGE_EBT_802_3=m
251 +CONFIG_BRIDGE_EBT_AMONG=m
252 +CONFIG_BRIDGE_EBT_ARP=m
253 +CONFIG_BRIDGE_EBT_IP=m
254 +CONFIG_BRIDGE_EBT_IP6=m
255 +CONFIG_BRIDGE_EBT_LIMIT=m
256 +CONFIG_BRIDGE_EBT_MARK=m
257 +CONFIG_BRIDGE_EBT_PKTTYPE=m
258 +CONFIG_BRIDGE_EBT_STP=m
259 +CONFIG_BRIDGE_EBT_VLAN=m
260 +CONFIG_BRIDGE_EBT_ARPREPLY=m
261 +CONFIG_BRIDGE_EBT_DNAT=m
262 +CONFIG_BRIDGE_EBT_MARK_T=m
263 +CONFIG_BRIDGE_EBT_REDIRECT=m
264 +CONFIG_BRIDGE_EBT_SNAT=m
265 +CONFIG_BRIDGE_EBT_LOG=m
266 +CONFIG_BRIDGE_EBT_ULOG=m
267 +CONFIG_BRIDGE_EBT_NFLOG=m
268 +CONFIG_SCTP_COOKIE_HMAC_SHA1=y
272 +CONFIG_VLAN_8021Q_GVRP=y
275 +CONFIG_NET_SCH_CBQ=m
276 +CONFIG_NET_SCH_HTB=m
277 +CONFIG_NET_SCH_HFSC=m
278 +CONFIG_NET_SCH_PRIO=m
279 +CONFIG_NET_SCH_MULTIQ=m
280 +CONFIG_NET_SCH_RED=m
281 +CONFIG_NET_SCH_SFB=m
282 +CONFIG_NET_SCH_SFQ=m
283 +CONFIG_NET_SCH_TEQL=m
284 +CONFIG_NET_SCH_TBF=m
285 +CONFIG_NET_SCH_GRED=m
286 +CONFIG_NET_SCH_DSMARK=m
287 +CONFIG_NET_SCH_NETEM=m
288 +CONFIG_NET_SCH_DRR=m
289 +CONFIG_NET_SCH_MQPRIO=m
290 +CONFIG_NET_SCH_CHOKE=m
291 +CONFIG_NET_SCH_QFQ=m
292 +CONFIG_NET_SCH_CODEL=m
293 +CONFIG_NET_SCH_FQ_CODEL=m
294 +CONFIG_NET_SCH_INGRESS=m
295 +CONFIG_NET_SCH_PLUG=m
296 +CONFIG_NET_CLS_BASIC=m
297 +CONFIG_NET_CLS_TCINDEX=m
298 +CONFIG_NET_CLS_ROUTE4=m
300 +CONFIG_NET_CLS_U32=m
301 +CONFIG_CLS_U32_MARK=y
302 +CONFIG_NET_CLS_RSVP=m
303 +CONFIG_NET_CLS_RSVP6=m
304 +CONFIG_NET_CLS_FLOW=m
305 +CONFIG_NET_CLS_CGROUP=m
307 +CONFIG_NET_EMATCH_CMP=m
308 +CONFIG_NET_EMATCH_NBYTE=m
309 +CONFIG_NET_EMATCH_U32=m
310 +CONFIG_NET_EMATCH_META=m
311 +CONFIG_NET_EMATCH_TEXT=m
312 +CONFIG_NET_EMATCH_IPSET=m
313 +CONFIG_NET_CLS_ACT=y
314 +CONFIG_NET_ACT_POLICE=m
315 +CONFIG_NET_ACT_GACT=m
317 +CONFIG_NET_ACT_MIRRED=m
318 +CONFIG_NET_ACT_IPT=m
319 +CONFIG_NET_ACT_NAT=m
320 +CONFIG_NET_ACT_PEDIT=m
321 +CONFIG_NET_ACT_SIMP=m
322 +CONFIG_NET_ACT_SKBEDIT=m
323 +CONFIG_NET_ACT_CSUM=m
325 +CONFIG_OPENVSWITCH=m
334 +CONFIG_BAYCOM_SER_FDX=m
335 +CONFIG_BAYCOM_SER_HDX=m
342 CONFIG_IRDA_CACHE_LAST_LSAP=y
343 @@ -73,8 +331,6 @@ CONFIG_USB_IRDA=m
344 CONFIG_SIGMATEL_FIR=m
350 CONFIG_BT_RFCOMM_TTY=y
352 @@ -89,21 +345,28 @@ CONFIG_BT_HCIVHCI=m
354 CONFIG_BT_MRVL_SDIO=m
358 +CONFIG_CFG80211_WEXT=y
360 CONFIG_MAC80211_RC_PID=y
361 CONFIG_MAC80211_MESH=y
364 +CONFIG_RFKILL_INPUT=y
368 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
370 +CONFIG_DEVTMPFS_MOUNT=y
372 CONFIG_BLK_DEV_LOOP=y
373 CONFIG_BLK_DEV_CRYPTOLOOP=m
374 +CONFIG_BLK_DEV_DRBD=m
377 CONFIG_CDROM_PKTCDVD=m
378 -CONFIG_MISC_DEVICES=y
380 # CONFIG_SCSI_PROC_FS is not set
382 @@ -111,13 +374,50 @@ CONFIG_BLK_DEV_SR=m
383 CONFIG_SCSI_MULTI_LUN=y
384 # CONFIG_SCSI_LOWLEVEL is not set
393 CONFIG_MDIO_BITBANG=m
394 -CONFIG_NET_ETHERNET=y
395 -# CONFIG_NETDEV_1000 is not set
396 -# CONFIG_NETDEV_10000 is not set
398 +CONFIG_PPP_BSDCOMP=m
399 +CONFIG_PPP_DEFLATE=m
401 +CONFIG_PPP_SYNC_TTY=m
403 +CONFIG_SLIP_COMPRESSED=y
406 +CONFIG_USB_PEGASUS=m
407 +CONFIG_USB_RTL8150=m
408 +CONFIG_USB_RTL8152=m
410 +CONFIG_USB_NET_AX8817X=m
411 +CONFIG_USB_NET_CDCETHER=m
412 +CONFIG_USB_NET_CDC_EEM=m
413 +CONFIG_USB_NET_CDC_MBIM=m
414 +CONFIG_USB_NET_DM9601=m
415 +CONFIG_USB_NET_SMSC75XX=m
416 +CONFIG_USB_NET_SMSC95XX=y
417 +CONFIG_USB_NET_GL620A=m
418 +CONFIG_USB_NET_NET1080=m
419 +CONFIG_USB_NET_PLUSB=m
420 +CONFIG_USB_NET_MCS7830=m
421 +CONFIG_USB_NET_CDC_SUBSET=m
422 +CONFIG_USB_ALI_M5632=y
424 +CONFIG_USB_EPSON2888=y
426 +CONFIG_USB_NET_ZAURUS=m
427 +CONFIG_USB_NET_CX82310_ETH=m
428 +CONFIG_USB_NET_KALMIA=m
429 +CONFIG_USB_NET_QMI_WWAN=m
430 +CONFIG_USB_NET_INT51X1=m
432 +CONFIG_USB_SIERRA_NET=m
434 CONFIG_LIBERTAS_THINFIRM=m
435 CONFIG_LIBERTAS_THINFIRM_USB=m
436 CONFIG_AT76C50X_USB=m
437 @@ -125,14 +425,16 @@ CONFIG_USB_ZD1201=m
438 CONFIG_USB_NET_RNDIS_WLAN=m
440 CONFIG_MAC80211_HWSIM=m
454 CONFIG_LIBERTAS_USB=m
455 CONFIG_LIBERTAS_SDIO=m
456 @@ -143,56 +445,25 @@ CONFIG_RT2500USB=m
459 CONFIG_RT2800USB_RT53XX=y
462 -CONFIG_WL12XX_MENU=m
463 +CONFIG_RT2800USB_UNKNOWN=y
466 CONFIG_MWIFIEX_SDIO=m
468 CONFIG_WIMAX_I2400M_USB=m
471 -CONFIG_USB_PEGASUS=m
472 -CONFIG_USB_RTL8150=m
474 -CONFIG_USB_NET_AX8817X=m
475 -CONFIG_USB_NET_CDCETHER=m
476 -CONFIG_USB_NET_CDC_EEM=m
477 -CONFIG_USB_NET_DM9601=m
478 -CONFIG_USB_NET_SMSC75XX=m
479 -CONFIG_USB_NET_SMSC95XX=y
480 -CONFIG_USB_NET_GL620A=m
481 -CONFIG_USB_NET_NET1080=m
482 -CONFIG_USB_NET_PLUSB=m
483 -CONFIG_USB_NET_MCS7830=m
484 -CONFIG_USB_NET_CDC_SUBSET=m
485 -CONFIG_USB_ALI_M5632=y
488 -# CONFIG_USB_NET_ZAURUS is not set
489 -CONFIG_USB_NET_CX82310_ETH=m
490 -CONFIG_USB_NET_KALMIA=m
491 -CONFIG_USB_NET_INT51X1=m
493 -CONFIG_USB_SIERRA_NET=m
497 -CONFIG_PPP_SYNC_TTY=m
498 -CONFIG_PPP_DEFLATE=m
499 -CONFIG_PPP_BSDCOMP=m
501 -CONFIG_SLIP_COMPRESSED=y
503 CONFIG_INPUT_POLLDEV=m
504 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
505 CONFIG_INPUT_JOYDEV=m
507 # CONFIG_INPUT_KEYBOARD is not set
508 # CONFIG_INPUT_MOUSE is not set
509 +CONFIG_INPUT_JOYSTICK=y
510 +CONFIG_JOYSTICK_IFORCE=m
511 +CONFIG_JOYSTICK_IFORCE_USB=y
512 +CONFIG_JOYSTICK_XPAD=y
513 +CONFIG_JOYSTICK_XPAD_FF=y
515 CONFIG_INPUT_AD714X=m
516 -CONFIG_INPUT_ATI_REMOTE=m
517 CONFIG_INPUT_ATI_REMOTE2=m
518 CONFIG_INPUT_KEYSPAN_REMOTE=m
519 CONFIG_INPUT_POWERMATE=m
520 @@ -202,28 +473,188 @@ CONFIG_INPUT_UINPUT=m
521 CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
522 CONFIG_INPUT_ADXL34X=m
523 CONFIG_INPUT_CMA3000=m
527 -CONFIG_GAMEPORT_NS558=m
528 -CONFIG_GAMEPORT_L4=m
529 +# CONFIG_SERIO is not set
530 CONFIG_VT_HW_CONSOLE_BINDING=y
531 # CONFIG_LEGACY_PTYS is not set
532 # CONFIG_DEVKMEM is not set
533 CONFIG_SERIAL_AMBA_PL011=y
534 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
535 -# CONFIG_HW_RANDOM is not set
537 +CONFIG_HW_RANDOM_BCM2708=y
539 +CONFIG_BRCM_CHAR_DRIVERS=y
549 +CONFIG_W1_MASTER_DS2490=m
550 +CONFIG_W1_MASTER_DS2482=m
551 +CONFIG_W1_MASTER_DS1WM=m
552 +CONFIG_W1_MASTER_GPIO=m
553 +CONFIG_W1_SLAVE_THERM=m
554 +CONFIG_W1_SLAVE_SMEM=m
555 +CONFIG_W1_SLAVE_DS2408=m
556 +CONFIG_W1_SLAVE_DS2413=m
557 +CONFIG_W1_SLAVE_DS2423=m
558 +CONFIG_W1_SLAVE_DS2431=m
559 +CONFIG_W1_SLAVE_DS2433=m
560 +CONFIG_W1_SLAVE_DS2760=m
561 +CONFIG_W1_SLAVE_DS2780=m
562 +CONFIG_W1_SLAVE_DS2781=m
563 +CONFIG_W1_SLAVE_DS28E04=m
564 +CONFIG_W1_SLAVE_BQ27000=m
565 +CONFIG_BATTERY_DS2760=m
566 # CONFIG_HWMON is not set
568 +CONFIG_THERMAL_BCM2835=y
571 -# CONFIG_MFD_SUPPORT is not set
572 +CONFIG_MEDIA_SUPPORT=m
573 +CONFIG_MEDIA_CAMERA_SUPPORT=y
574 +CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
575 +CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
576 +CONFIG_MEDIA_RADIO_SUPPORT=y
577 +CONFIG_MEDIA_RC_SUPPORT=y
578 +CONFIG_MEDIA_CONTROLLER=y
581 +CONFIG_RC_ATI_REMOTE=m
585 +CONFIG_IR_STREAMZAP=m
588 +CONFIG_RC_LOOPBACK=m
589 +CONFIG_IR_GPIO_CIR=m
590 +CONFIG_MEDIA_USB_SUPPORT=y
591 +CONFIG_USB_VIDEO_CLASS=m
593 +CONFIG_USB_STV06XX=m
595 +CONFIG_USB_GSPCA_BENQ=m
596 +CONFIG_USB_GSPCA_CONEX=m
597 +CONFIG_USB_GSPCA_CPIA1=m
598 +CONFIG_USB_GSPCA_ETOMS=m
599 +CONFIG_USB_GSPCA_FINEPIX=m
600 +CONFIG_USB_GSPCA_JEILINJ=m
601 +CONFIG_USB_GSPCA_JL2005BCD=m
602 +CONFIG_USB_GSPCA_KINECT=m
603 +CONFIG_USB_GSPCA_KONICA=m
604 +CONFIG_USB_GSPCA_MARS=m
605 +CONFIG_USB_GSPCA_MR97310A=m
606 +CONFIG_USB_GSPCA_NW80X=m
607 +CONFIG_USB_GSPCA_OV519=m
608 +CONFIG_USB_GSPCA_OV534=m
609 +CONFIG_USB_GSPCA_OV534_9=m
610 +CONFIG_USB_GSPCA_PAC207=m
611 +CONFIG_USB_GSPCA_PAC7302=m
612 +CONFIG_USB_GSPCA_PAC7311=m
613 +CONFIG_USB_GSPCA_SE401=m
614 +CONFIG_USB_GSPCA_SN9C2028=m
615 +CONFIG_USB_GSPCA_SN9C20X=m
616 +CONFIG_USB_GSPCA_SONIXB=m
617 +CONFIG_USB_GSPCA_SONIXJ=m
618 +CONFIG_USB_GSPCA_SPCA500=m
619 +CONFIG_USB_GSPCA_SPCA501=m
620 +CONFIG_USB_GSPCA_SPCA505=m
621 +CONFIG_USB_GSPCA_SPCA506=m
622 +CONFIG_USB_GSPCA_SPCA508=m
623 +CONFIG_USB_GSPCA_SPCA561=m
624 +CONFIG_USB_GSPCA_SPCA1528=m
625 +CONFIG_USB_GSPCA_SQ905=m
626 +CONFIG_USB_GSPCA_SQ905C=m
627 +CONFIG_USB_GSPCA_SQ930X=m
628 +CONFIG_USB_GSPCA_STK014=m
629 +CONFIG_USB_GSPCA_STV0680=m
630 +CONFIG_USB_GSPCA_SUNPLUS=m
631 +CONFIG_USB_GSPCA_T613=m
632 +CONFIG_USB_GSPCA_TOPRO=m
633 +CONFIG_USB_GSPCA_TV8532=m
634 +CONFIG_USB_GSPCA_VC032X=m
635 +CONFIG_USB_GSPCA_VICAM=m
636 +CONFIG_USB_GSPCA_XIRLINK_CIT=m
637 +CONFIG_USB_GSPCA_ZC3XX=m
639 +CONFIG_VIDEO_CPIA2=m
640 +CONFIG_USB_ZR364XX=m
641 +CONFIG_USB_STKWEBCAM=m
643 +CONFIG_USB_SN9C102=m
644 +CONFIG_VIDEO_PVRUSB2=m
645 +CONFIG_VIDEO_HDPVR=m
646 +CONFIG_VIDEO_TLG2300=m
647 +CONFIG_VIDEO_USBVISION=m
648 +CONFIG_VIDEO_STK1160=m
649 +CONFIG_VIDEO_STK1160_AC97=y
650 +CONFIG_VIDEO_AU0828=m
651 +CONFIG_VIDEO_CX231XX=m
652 +CONFIG_VIDEO_CX231XX_ALSA=m
653 +CONFIG_VIDEO_CX231XX_DVB=m
654 +CONFIG_VIDEO_TM6000=m
655 +CONFIG_VIDEO_TM6000_ALSA=m
656 +CONFIG_VIDEO_TM6000_DVB=m
658 +CONFIG_DVB_USB_A800=m
659 +CONFIG_DVB_USB_DIBUSB_MB=m
660 +CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
661 +CONFIG_DVB_USB_DIBUSB_MC=m
662 +CONFIG_DVB_USB_DIB0700=m
663 +CONFIG_DVB_USB_UMT_010=m
664 +CONFIG_DVB_USB_CXUSB=m
665 +CONFIG_DVB_USB_M920X=m
666 +CONFIG_DVB_USB_DIGITV=m
667 +CONFIG_DVB_USB_VP7045=m
668 +CONFIG_DVB_USB_VP702X=m
669 +CONFIG_DVB_USB_GP8PSK=m
670 +CONFIG_DVB_USB_NOVA_T_USB2=m
671 +CONFIG_DVB_USB_TTUSB2=m
672 +CONFIG_DVB_USB_DTT200U=m
673 +CONFIG_DVB_USB_OPERA1=m
674 +CONFIG_DVB_USB_AF9005=m
675 +CONFIG_DVB_USB_AF9005_REMOTE=m
676 +CONFIG_DVB_USB_PCTV452E=m
677 +CONFIG_DVB_USB_DW2102=m
678 +CONFIG_DVB_USB_CINERGY_T2=m
679 +CONFIG_DVB_USB_DTV5100=m
680 +CONFIG_DVB_USB_FRIIO=m
681 +CONFIG_DVB_USB_AZ6027=m
682 +CONFIG_DVB_USB_TECHNISAT_USB2=m
684 +CONFIG_DVB_USB_AF9015=m
685 +CONFIG_DVB_USB_AF9035=m
686 +CONFIG_DVB_USB_ANYSEE=m
687 +CONFIG_DVB_USB_AU6610=m
688 +CONFIG_DVB_USB_AZ6007=m
689 +CONFIG_DVB_USB_CE6230=m
690 +CONFIG_DVB_USB_EC168=m
691 +CONFIG_DVB_USB_GL861=m
692 +CONFIG_DVB_USB_IT913X=m
693 +CONFIG_DVB_USB_LME2510=m
694 +CONFIG_DVB_USB_MXL111SF=m
695 +CONFIG_DVB_USB_RTL28XXU=m
696 +CONFIG_SMS_USB_DRV=m
697 +CONFIG_DVB_B2C2_FLEXCOP_USB=m
698 +CONFIG_VIDEO_EM28XX=m
699 +CONFIG_VIDEO_EM28XX_ALSA=m
700 +CONFIG_VIDEO_EM28XX_DVB=m
701 +CONFIG_RADIO_SI470X=y
705 +CONFIG_RADIO_SHARK=m
706 +CONFIG_RADIO_SHARK2=m
707 +CONFIG_RADIO_SI4713=m
710 +CONFIG_RADIO_SAA7706H=m
711 +CONFIG_RADIO_TEF6862=m
712 +CONFIG_RADIO_WL128X=m
715 CONFIG_FRAMEBUFFER_CONSOLE=y
716 @@ -250,8 +681,7 @@ CONFIG_SND_USB_UA101=m
717 CONFIG_SND_USB_CAIAQ=m
718 CONFIG_SND_USB_6FIRE=m
726 @@ -282,7 +712,6 @@ CONFIG_HID_ORTEK=m
727 CONFIG_HID_PANTHERLORD=m
728 CONFIG_HID_PETALYNX=m
734 @@ -291,15 +720,18 @@ CONFIG_HID_SUNPLUS=m
735 CONFIG_HID_GREENASIA=m
736 CONFIG_HID_SMARTJOYPLUS=m
739 CONFIG_HID_THRUSTMASTER=m
742 CONFIG_HID_ZEROPLUS=m
743 CONFIG_HID_ZYDACRON=m
747 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
750 +CONFIG_USB_PRINTER=m
752 CONFIG_USB_STORAGE_REALTEK=m
753 CONFIG_USB_STORAGE_DATAFAB=m
754 @@ -314,8 +746,6 @@ CONFIG_USB_STORAGE_ONETOUCH=m
755 CONFIG_USB_STORAGE_KARMA=m
756 CONFIG_USB_STORAGE_CYPRESS_ATACB=m
757 CONFIG_USB_STORAGE_ENE_UB6250=m
759 -CONFIG_USB_LIBUSUAL=y
761 CONFIG_USB_MICROTEK=m
763 @@ -336,6 +766,7 @@ CONFIG_USB_SERIAL_IPAQ=m
764 CONFIG_USB_SERIAL_IR=m
765 CONFIG_USB_SERIAL_EDGEPORT=m
766 CONFIG_USB_SERIAL_EDGEPORT_TI=m
767 +CONFIG_USB_SERIAL_F81232=m
768 CONFIG_USB_SERIAL_GARMIN=m
769 CONFIG_USB_SERIAL_IPW=m
770 CONFIG_USB_SERIAL_IUU=m
771 @@ -344,6 +775,7 @@ CONFIG_USB_SERIAL_KEYSPAN=m
772 CONFIG_USB_SERIAL_KLSI=m
773 CONFIG_USB_SERIAL_KOBIL_SCT=m
774 CONFIG_USB_SERIAL_MCT_U232=m
775 +CONFIG_USB_SERIAL_METRO=m
776 CONFIG_USB_SERIAL_MOS7720=m
777 CONFIG_USB_SERIAL_MOS7840=m
778 CONFIG_USB_SERIAL_MOTOROLA=m
779 @@ -365,8 +797,12 @@ CONFIG_USB_SERIAL_OPTION=m
780 CONFIG_USB_SERIAL_OMNINET=m
781 CONFIG_USB_SERIAL_OPTICON=m
782 CONFIG_USB_SERIAL_VIVOPAY_SERIAL=m
783 +CONFIG_USB_SERIAL_XSENS_MT=m
784 CONFIG_USB_SERIAL_ZIO=m
785 +CONFIG_USB_SERIAL_WISHBONE=m
786 +CONFIG_USB_SERIAL_ZTE=m
787 CONFIG_USB_SERIAL_SSU100=m
788 +CONFIG_USB_SERIAL_QT2=m
789 CONFIG_USB_SERIAL_DEBUG=m
792 @@ -388,17 +824,59 @@ CONFIG_USB_TEST=m
793 CONFIG_USB_ISIGHTFW=m
796 +CONFIG_MMC_BLOCK_MINORS=32
798 CONFIG_MMC_SDHCI_PLTFM=y
799 CONFIG_MMC_SDHCI_BCM2708=y
800 CONFIG_MMC_SDHCI_BCM2708_DMA=y
802 -CONFIG_LEDS_TRIGGER_TIMER=m
803 -CONFIG_LEDS_TRIGGER_HEARTBEAT=m
804 -CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
806 +CONFIG_LEDS_TRIGGER_TIMER=y
807 +CONFIG_LEDS_TRIGGER_ONESHOT=y
808 +CONFIG_LEDS_TRIGGER_HEARTBEAT=y
809 +CONFIG_LEDS_TRIGGER_BACKLIGHT=y
810 +CONFIG_LEDS_TRIGGER_CPU=y
811 +CONFIG_LEDS_TRIGGER_GPIO=y
812 +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
813 +CONFIG_LEDS_TRIGGER_TRANSIENT=m
814 +CONFIG_LEDS_TRIGGER_CAMERA=m
816 +CONFIG_RTC_DRV_DS1307=m
817 +CONFIG_RTC_DRV_DS1374=m
818 +CONFIG_RTC_DRV_DS1672=m
819 +CONFIG_RTC_DRV_DS3232=m
820 +CONFIG_RTC_DRV_MAX6900=m
821 +CONFIG_RTC_DRV_RS5C372=m
822 +CONFIG_RTC_DRV_ISL1208=m
823 +CONFIG_RTC_DRV_ISL12022=m
824 +CONFIG_RTC_DRV_X1205=m
825 +CONFIG_RTC_DRV_PCF8523=m
826 +CONFIG_RTC_DRV_PCF8563=m
827 +CONFIG_RTC_DRV_PCF8583=m
828 +CONFIG_RTC_DRV_M41T80=m
829 +CONFIG_RTC_DRV_BQ32K=m
830 +CONFIG_RTC_DRV_S35390A=m
831 +CONFIG_RTC_DRV_FM3130=m
832 +CONFIG_RTC_DRV_RX8581=m
833 +CONFIG_RTC_DRV_RX8025=m
834 +CONFIG_RTC_DRV_EM3027=m
835 +CONFIG_RTC_DRV_RV3029C2=m
836 +CONFIG_RTC_DRV_M41T93=m
837 +CONFIG_RTC_DRV_M41T94=m
838 +CONFIG_RTC_DRV_DS1305=m
839 +CONFIG_RTC_DRV_DS1390=m
840 +CONFIG_RTC_DRV_MAX6902=m
841 +CONFIG_RTC_DRV_R9701=m
842 +CONFIG_RTC_DRV_RS5C348=m
843 +CONFIG_RTC_DRV_DS3234=m
844 +CONFIG_RTC_DRV_PCF2123=m
845 +CONFIG_RTC_DRV_RX4581=m
848 CONFIG_UIO_PDRV_GENIRQ=m
850 +CONFIG_STAGING_MEDIA=y
851 +CONFIG_LIRC_STAGING=y
853 # CONFIG_IOMMU_SUPPORT is not set
855 CONFIG_EXT4_FS_POSIX_ACL=y
856 @@ -421,6 +899,8 @@ CONFIG_BTRFS_FS=m
857 CONFIG_BTRFS_FS_POSIX_ACL=y
865 @@ -443,21 +923,22 @@ CONFIG_SQUASHFS=m
866 CONFIG_SQUASHFS_XATTR=y
867 CONFIG_SQUASHFS_LZO=y
877 +CONFIG_NFSD_V3_ACL=y
880 CONFIG_CIFS_WEAK_PW_HASH=y
883 +# CONFIG_CIFS_DEBUG is not set
885 CONFIG_9P_FS_POSIX_ACL=y
886 -CONFIG_PARTITION_ADVANCED=y
887 -CONFIG_MAC_PARTITION=y
888 -CONFIG_EFI_PARTITION=y
889 CONFIG_NLS_DEFAULT="utf8"
890 CONFIG_NLS_CODEPAGE_437=y
891 CONFIG_NLS_CODEPAGE_737=m
892 @@ -497,38 +978,28 @@ CONFIG_NLS_ISO8859_15=m
898 CONFIG_DETECT_HUNG_TASK=y
900 -CONFIG_DEBUG_STACK_USAGE=y
902 CONFIG_DEBUG_MEMORY_INIT=y
903 CONFIG_BOOT_PRINTK_DELAY=y
905 -CONFIG_SYSCTL_SYSCALL_CHECK=y
906 -CONFIG_IRQSOFF_TRACER=y
907 -CONFIG_SCHED_TRACER=y
908 -CONFIG_STACK_TRACER=y
909 -CONFIG_BLK_DEV_IO_TRACE=y
910 -CONFIG_FUNCTION_PROFILER=y
913 CONFIG_KDB_KEYBOARD=y
914 CONFIG_STRICT_DEVMEM=y
915 -CONFIG_CRYPTO_AUTHENC=m
916 CONFIG_CRYPTO_SEQIV=m
922 -CONFIG_CRYPTO_SHA256=m
923 CONFIG_CRYPTO_SHA512=m
924 CONFIG_CRYPTO_TGR192=m
925 CONFIG_CRYPTO_WP512=m
926 CONFIG_CRYPTO_CAST5=m
928 -CONFIG_CRYPTO_DEFLATE=m
929 # CONFIG_CRYPTO_ANSI_CPRNG is not set
930 # CONFIG_CRYPTO_HW is not set
932 diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
933 index 75a6376..8cb8d8d 100644
934 --- a/drivers/net/wireless/ath/ath9k/hif_usb.c
935 +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
936 @@ -37,9 +37,11 @@ static struct usb_device_id ath9k_hif_usb_ids[] = {
937 { USB_DEVICE(0x13D3, 0x3350) }, /* Azurewave */
938 { USB_DEVICE(0x04CA, 0x4605) }, /* Liteon */
939 { USB_DEVICE(0x040D, 0x3801) }, /* VIA */
940 + { USB_DEVICE(0x0cf3, 0xb002) }, /* Ubiquiti WifiStation */
941 { USB_DEVICE(0x0cf3, 0xb003) }, /* Ubiquiti WifiStation Ext */
942 { USB_DEVICE(0x0cf3, 0xb002) }, /* Ubiquiti WifiStation */
943 { USB_DEVICE(0x057c, 0x8403) }, /* AVM FRITZ!WLAN 11N v2 USB */
944 + { USB_DEVICE(0x057c, 0x8403) }, /* AVM FRITZ!WLAN 11N v2 USB */
946 { USB_DEVICE(0x0cf3, 0x7015),
947 .driver_info = AR9287_USB }, /* Atheros */