diff options
author | Roger Tseng | 2012-10-19 11:43:34 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2012-10-23 00:58:22 +0200 |
commit | 355d8ae57be9d3a2fe5764f75e394063022b7866 (patch) | |
tree | 499383f0e818bd1745028efbbcc090104742404c /drivers/staging/rts5139/sd.h | |
parent | Staging: ipack/carriers: fix missing include linux/slab.h (diff) | |
download | kernel-qcow2-linux-355d8ae57be9d3a2fe5764f75e394063022b7866.tar.gz kernel-qcow2-linux-355d8ae57be9d3a2fe5764f75e394063022b7866.tar.xz kernel-qcow2-linux-355d8ae57be9d3a2fe5764f75e394063022b7866.zip |
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>
Diffstat (limited to 'drivers/staging/rts5139/sd.h')
-rw-r--r-- | drivers/staging/rts5139/sd.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/rts5139/sd.h b/drivers/staging/rts5139/sd.h index de155d8e682d..7dd943f54c74 100644 --- a/drivers/staging/rts5139/sd.h +++ b/drivers/staging/rts5139/sd.h @@ -256,13 +256,13 @@ struct timing_phase_path { int len; }; -int sd_select_card(struct rts51x_chip *chip, int select); -int reset_sd_card(struct rts51x_chip *chip); -int sd_switch_clock(struct rts51x_chip *chip); -int sd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector, +int rts51x_sd_select_card(struct rts51x_chip *chip, int select); +int rts51x_reset_sd_card(struct rts51x_chip *chip); +int rts51x_sd_switch_clock(struct rts51x_chip *chip); +int rts51x_sd_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 start_sector, u16 sector_cnt); -void sd_cleanup_work(struct rts51x_chip *chip); -int release_sd_card(struct rts51x_chip *chip); +void rts51x_sd_cleanup_work(struct rts51x_chip *chip); +int rts51x_release_sd_card(struct rts51x_chip *chip); #ifdef SUPPORT_CPRM extern int reset_sd(struct rts51x_chip *chip); |