diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-04-27 10:08:48 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-04-27 10:08:48 +0800 |
commit | a79bee58f4fc3cc237fc86667edf2d0b9dce0173 (patch) | |
tree | 7d1df3ba21a3de136cd0649caeec50f793133a03 /drivers/scsi/be2iscsi/be_main.c | |
parent | ef59ba115fc76ea4c21030f49e31fe18e9055679 (diff) | |
parent | e0ac66e00b01f6ff4e8274a4b5c008a26583c1b9 (diff) |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlsk-v3.18-16.04-android
Conflicts:
arch/arm64/kernel/head.S
arch/arm64/mm/Makefile
Diffstat (limited to 'drivers/scsi/be2iscsi/be_main.c')
-rw-r--r-- | drivers/scsi/be2iscsi/be_main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c index 3ed37dc28b3c..543b7d54d7aa 100644 --- a/drivers/scsi/be2iscsi/be_main.c +++ b/drivers/scsi/be2iscsi/be_main.c @@ -48,7 +48,6 @@ static unsigned int be_iopoll_budget = 10; static unsigned int be_max_phys_size = 64; static unsigned int enable_msix = 1; -MODULE_DEVICE_TABLE(pci, beiscsi_pci_id_table); MODULE_DESCRIPTION(DRV_DESC " " BUILD_STR); MODULE_VERSION(BUILD_STR); MODULE_AUTHOR("Emulex Corporation"); |