From: Andrew Morton Signed-off-by: Andrew Morton --- MAINTAINERS | 6 +----- scripts/mod/file2alias.c | 4 ++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff -puN scripts/mod/file2alias.c~git-wireless-fixup scripts/mod/file2alias.c --- a/scripts/mod/file2alias.c~git-wireless-fixup +++ a/scripts/mod/file2alias.c @@ -623,6 +623,10 @@ void handle_moddevtable(struct module *m do_table(symval, sym->st_size, sizeof(struct sdio_device_id), "sdio", do_sdio_entry, mod); + else if (sym_is(symname, "__mod_ssb_device_table")) + do_table(symval, sym->st_size, + sizeof(struct ssb_device_id), "ssb", + do_ssb_entry, mod); } /* Now add out buffered information to the generated C source */ diff -puN MAINTAINERS~git-wireless-fixup MAINTAINERS --- a/MAINTAINERS~git-wireless-fixup +++ a/MAINTAINERS @@ -2123,9 +2123,6 @@ L: http://lists.sourceforge.net/mailman/ W: http://ipw2200.sourceforge.net S: Supported -<<<<<<< HEAD/MAINTAINERS -IOC3 ETHERNET DRIVER -======= INTEL WIRELESS WIFI LINK (iwlwifi) P: Zhu Yi M: yi.zhu@intel.com @@ -2136,8 +2133,7 @@ W: http://intellinuxwireless.org T: git git://intellinuxwireless.org/repos/iwlwifi S: Supported -IOC3 DRIVER ->>>>>>> /MAINTAINERS +IOC3 ETHERNET DRIVER P: Ralf Baechle M: ralf@linux-mips.org L: linux-mips@linux-mips.org _