diff options
| author | Greg Kroah-Hartman <[email protected]> | 2012-09-17 03:42:46 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2012-09-17 03:42:46 +0000 |
| commit | 2bcb132c693566bcb8208cc7ce66b72a4f852ecf (patch) | |
| tree | 6fc4f05ce18140d86aa78a10380a610734aeaef9 /arch/mips/include/asm/module.h | |
| parent | USB: serial: io_ti.c: remove dbg() usage (diff) | |
| parent | Linux 3.6-rc6 (diff) | |
| download | kernel-2bcb132c693566bcb8208cc7ce66b72a4f852ecf.tar.gz kernel-2bcb132c693566bcb8208cc7ce66b72a4f852ecf.zip | |
Merge 3.6-rc6 into usb-next
This resolves the merge problems with:
drivers/usb/dwc3/gadget.c
drivers/usb/musb/tusb6010.c
that had been seen in linux-next.
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'arch/mips/include/asm/module.h')
| -rw-r--r-- | arch/mips/include/asm/module.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/include/asm/module.h b/arch/mips/include/asm/module.h index 7531ecd654d6..dca8bce8c7ab 100644 --- a/arch/mips/include/asm/module.h +++ b/arch/mips/include/asm/module.h @@ -10,6 +10,7 @@ struct mod_arch_specific { struct list_head dbe_list; const struct exception_table_entry *dbe_start; const struct exception_table_entry *dbe_end; + struct mips_hi16 *r_mips_hi16_list; }; typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */ |