staging: rts5139: fixed issues when config to built-in object
authorRoger Tseng <rogerable@realtek.com>
Fri, 19 Oct 2012 09:43:34 +0000 (17:43 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Oct 2012 22:58:22 +0000 (15:58 -0700)
commit355d8ae57be9d3a2fe5764f75e394063022b7866
tree499383f0e818bd1745028efbbcc090104742404c
parent9f3059c91b44b4c2bde1a1d706856d79fc5ea14c
staging: rts5139: fixed issues when config to built-in object

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>
19 files changed:
drivers/staging/rts5139/Makefile
drivers/staging/rts5139/ms.c
drivers/staging/rts5139/ms.h
drivers/staging/rts5139/ms_mg.c
drivers/staging/rts5139/ms_mg.h
drivers/staging/rts5139/rts51x.c
drivers/staging/rts5139/rts51x_card.c
drivers/staging/rts5139/rts51x_card.h
drivers/staging/rts5139/rts51x_chip.c
drivers/staging/rts5139/rts51x_chip.h
drivers/staging/rts5139/rts51x_fop.c
drivers/staging/rts5139/rts51x_scsi.c
drivers/staging/rts5139/rts51x_scsi.h
drivers/staging/rts5139/sd.c
drivers/staging/rts5139/sd.h
drivers/staging/rts5139/sd_cprm.c
drivers/staging/rts5139/sd_cprm.h
drivers/staging/rts5139/xd.c
drivers/staging/rts5139/xd.h