Revision 179192d38e8906f00479ec944c15b685400232b0 authored by Bill Gatliff on 18 December 2009, 15:57:22 UTC, committed by Greg Kroah-Hartman on 23 December 2009, 19:34:10 UTC
This patch corrects a problem where drivers/usb/otg is linked twice if CONFIG_USB_ULPI is selected, resulting in a build error (symbol conflict). The files in that directory are properly linked already as part of CONFIG_USB, and need not be indicated specifically for CONFIG_USB_ULPI. Signed-off-by: Bill Gatliff <bgat@billgatliff.com> Acked-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
1 parent ff3b968
| File | Mode | Size |
|---|---|---|
| Kconfig | -rw-r--r-- | 16.4 KB |
| Makefile | -rw-r--r-- | 1.8 KB |
| act_api.c | -rw-r--r-- | 23.2 KB |
| act_gact.c | -rw-r--r-- | 5.4 KB |
| act_ipt.c | -rw-r--r-- | 7.4 KB |
| act_mirred.c | -rw-r--r-- | 6.0 KB |
| act_nat.c | -rw-r--r-- | 7.1 KB |
| act_pedit.c | -rw-r--r-- | 6.0 KB |
| act_police.c | -rw-r--r-- | 9.6 KB |
| act_simple.c | -rw-r--r-- | 5.1 KB |
| act_skbedit.c | -rw-r--r-- | 5.7 KB |
| cls_api.c | -rw-r--r-- | 13.7 KB |
| cls_basic.c | -rw-r--r-- | 6.4 KB |
| cls_cgroup.c | -rw-r--r-- | 6.4 KB |
| cls_flow.c | -rw-r--r-- | 15.3 KB |
| cls_fw.c | -rw-r--r-- | 8.3 KB |
| cls_route.c | -rw-r--r-- | 12.2 KB |
| cls_rsvp.c | -rw-r--r-- | 761 bytes |
| cls_rsvp.h | -rw-r--r-- | 14.6 KB |
| cls_rsvp6.c | -rw-r--r-- | 768 bytes |
| cls_tcindex.c | -rw-r--r-- | 11.7 KB |
| cls_u32.c | -rw-r--r-- | 16.2 KB |
| em_cmp.c | -rw-r--r-- | 2.1 KB |
| em_meta.c | -rw-r--r-- | 21.3 KB |
| em_nbyte.c | -rw-r--r-- | 1.9 KB |
| em_text.c | -rw-r--r-- | 3.6 KB |
| em_u32.c | -rw-r--r-- | 1.4 KB |
| ematch.c | -rw-r--r-- | 14.4 KB |
| sch_api.c | -rw-r--r-- | 39.4 KB |
| sch_atm.c | -rw-r--r-- | 19.6 KB |
| sch_blackhole.c | -rw-r--r-- | 1.2 KB |
| sch_cbq.c | -rw-r--r-- | 47.5 KB |
| sch_drr.c | -rw-r--r-- | 11.4 KB |
| sch_dsmark.c | -rw-r--r-- | 11.2 KB |
| sch_fifo.c | -rw-r--r-- | 3.5 KB |
| sch_generic.c | -rw-r--r-- | 19.6 KB |
| sch_gred.c | -rw-r--r-- | 13.3 KB |
| sch_hfsc.c | -rw-r--r-- | 40.6 KB |
| sch_htb.c | -rw-r--r-- | 42.0 KB |
| sch_ingress.c | -rw-r--r-- | 3.2 KB |
| sch_mq.c | -rw-r--r-- | 5.6 KB |
| sch_multiq.c | -rw-r--r-- | 9.3 KB |
| sch_netem.c | -rw-r--r-- | 15.3 KB |
| sch_prio.c | -rw-r--r-- | 8.3 KB |
| sch_red.c | -rw-r--r-- | 7.9 KB |
| sch_sfq.c | -rw-r--r-- | 13.5 KB |
| sch_tbf.c | -rw-r--r-- | 10.3 KB |
| sch_teql.c | -rw-r--r-- | 11.9 KB |
Computing file changes ...
