mirror of https://github.com/torvalds/linux.git
355d8ae57b
Fixed two issues when CONFIG_RTS5139=y :
- Makefile doesn't take $(CONFIG_RTS5139). It always uses obj-m and built as
a loadable module.
- Rename some symbols with prefix 'rts51x_' to prevent symbol name collisions
with drivers/staging/rts_pstor when both are configured to be built-in
objects.
drivers/staging/rts5139/built-in.o: In function `xd_cleanup_work':
(.text+0x1435d): multiple definition of `xd_cleanup_work'
drivers/staging/rts_pstor/built-in.o:(.text+0x2b96a): first defined here
drivers/staging/rts5139/built-in.o: In function `release_xd_card':
(.text+0x14393): multiple definition of `release_xd_card'
drivers/staging/rts_pstor/built-in.o:(.text+0x2c491): first defined here
drivers/staging/rts5139/built-in.o: In function `set_sense_data':
(.text+0x1e02): multiple definition of `set_sense_data'
drivers/staging/rts_pstor/built-in.o:(.text+0xa79f): first defined here
drivers/staging/rts5139/built-in.o: In function `ms_delay_write':
...
Signed-off-by: Roger Tseng <rogerable@realtek.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| TODO | ||
| debug.h | ||
| ms.c | ||
| ms.h | ||
| ms_mg.c | ||
| ms_mg.h | ||
| rts51x.c | ||
| rts51x.h | ||
| rts51x_card.c | ||
| rts51x_card.h | ||
| rts51x_chip.c | ||
| rts51x_chip.h | ||
| rts51x_fop.c | ||
| rts51x_fop.h | ||
| rts51x_scsi.c | ||
| rts51x_scsi.h | ||
| rts51x_transport.c | ||
| rts51x_transport.h | ||
| sd.c | ||
| sd.h | ||
| sd_cprm.c | ||
| sd_cprm.h | ||
| trace.h | ||
| xd.c | ||
| xd.h | ||