Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1446 commits)
  macvlan: fix panic if lowerdev in a bond
  tg3: Add braces around 5906 workaround.
  tg3: Fix NETIF_F_LOOPBACK error
  macvlan: remove one synchronize_rcu() call
  networking: NET_CLS_ROUTE4 depends on INET
  irda: Fix error propagation in ircomm_lmp_connect_response()
  irda: Kill set but unused variable 'bytes' in irlan_check_command_param()
  irda: Kill set but unused variable 'clen' in ircomm_connect_indication()
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport()
  be2net: Kill set but unused variable 'req' in lancer_fw_download()
  irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication()
  atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined.
  rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer().
  rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection()
  rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window()
  pkt_sched: Kill set but unused variable 'protocol' in tc_classify()
  isdn: capi: Use pr_debug() instead of ifdefs.
  tg3: Update version to 3.119
  tg3: Apply rx_discards fix to 5719/5720
  ...

Fix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c
as per Davem.

1 files changed, 22 insertions, 0 deletions

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 88f3f07205f8..e26e2fb462d4 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -702,6 +702,24 @@ static int do_ssb_entry(const char *filename,
         return 1;
 }
 
+/* Looks like: bcma:mNidNrevNclN. */
+static int do_bcma_entry(const char *filename,
+                         struct bcma_device_id *id, char *alias)
+{
+        id->manuf = TO_NATIVE(id->manuf);
+        id->id = TO_NATIVE(id->id);
+        id->rev = TO_NATIVE(id->rev);
+        id->class = TO_NATIVE(id->class);
+
+        strcpy(alias, "bcma:");
+        ADD(alias, "m", id->manuf != BCMA_ANY_MANUF, id->manuf);
+        ADD(alias, "id", id->id != BCMA_ANY_ID, id->id);
+        ADD(alias, "rev", id->rev != BCMA_ANY_REV, id->rev);
+        ADD(alias, "cl", id->class != BCMA_ANY_CLASS, id->class);
+        add_wildcard(alias);
+        return 1;
+}
+
 /* Looks like: virtio:dNvN */
 static int do_virtio_entry(const char *filename, struct virtio_device_id *id,
                            char *alias)
@@ -968,6 +986,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                 do_table(symval, sym->st_size,
                          sizeof(struct ssb_device_id), "ssb",
                          do_ssb_entry, mod);
+        else if (sym_is(symname, "__mod_bcma_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct bcma_device_id), "bcma",
+                         do_bcma_entry, mod);
         else if (sym_is(symname, "__mod_virtio_device_table"))
                 do_table(symval, sym->st_size,
                          sizeof(struct virtio_device_id), "virtio",