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/rts51x.c | |
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/rts51x.c')
-rw-r--r-- | drivers/staging/rts5139/rts51x.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/rts5139/rts51x.c b/drivers/staging/rts5139/rts51x.c index c3fe7dda1f4e..04213463123e 100644 --- a/drivers/staging/rts5139/rts51x.c +++ b/drivers/staging/rts5139/rts51x.c @@ -306,7 +306,7 @@ static int rts51x_control_thread(void *__chip) /* we've got a command, let's do it! */ else { - RTS51X_DEBUG(scsi_show_command(chip->srb)); + RTS51X_DEBUG(rts51x_scsi_show_command(chip->srb)); rts51x_invoke_transport(chip->srb, chip); } @@ -397,7 +397,7 @@ static int rts51x_polling_thread(void *__chip) } #endif - mspro_polling_format_status(chip); + rts51x_mspro_polling_format_status(chip); /* lock the device pointers */ mutex_lock(&(chip->usb->dev_mutex)); @@ -478,7 +478,7 @@ static void rts51x_init_options(struct rts51x_chip *chip) { struct rts51x_option *option = &(chip->option); - option->mspro_formatter_enable = 1; + option->rts51x_mspro_formatter_enable = 1; option->fpga_sd_sdr104_clk = CLK_100; option->fpga_sd_sdr50_clk = CLK_100; @@ -510,7 +510,7 @@ static void rts51x_init_options(struct rts51x_chip *chip) option->FT2_fast_mode = 0; option->pwr_delay = 800; - option->xd_rw_step = 0; + option->rts51x_xd_rw_step = 0; option->D3318_off_delay = 50; option->delink_delay = 100; option->rts5129_D3318_off_enable = 0; @@ -518,7 +518,7 @@ static void rts51x_init_options(struct rts51x_chip *chip) option->reset_or_rw_fail_set_pad_drive = 1; option->debounce_num = 2; option->led_toggle_interval = 6; - option->xd_rwn_step = 0; + option->rts51x_xd_rwn_step = 0; option->sd_send_status_en = 0; option->sdr50_tx_phase = 0x01; option->sdr50_rx_phase = 0x05; |