diff options
| author | David S. Miller <davem@davemloft.net> | 2013-01-15 15:05:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-15 15:05:59 -0500 |
| commit | 4b87f922598acf91eee18f71688a33f54f57bcde (patch) | |
| tree | 9cdfe30c6b96c47093da5392ed82d147290cd64c /drivers/mtd/maps/intel_vr_nor.c | |
| parent | 55eb555d9674e2ebe9d4de0146602f96ff18e7d6 (diff) | |
| parent | daf3ec688e057f6060fb9bb0819feac7a8bbf45c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/mtd/maps/intel_vr_nor.c')
| -rw-r--r-- | drivers/mtd/maps/intel_vr_nor.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mtd/maps/intel_vr_nor.c b/drivers/mtd/maps/intel_vr_nor.c index 3ee2ad1dcbe7..b14053b25026 100644 --- a/drivers/mtd/maps/intel_vr_nor.c +++ b/drivers/mtd/maps/intel_vr_nor.c | |||
| @@ -189,8 +189,7 @@ static void vr_nor_pci_remove(struct pci_dev *dev) | |||
| 189 | pci_disable_device(dev); | 189 | pci_disable_device(dev); |
| 190 | } | 190 | } |
| 191 | 191 | ||
| 192 | static int | 192 | static int vr_nor_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) |
| 193 | vr_nor_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) | ||
| 194 | { | 193 | { |
| 195 | struct vr_nor_mtd *p = NULL; | 194 | struct vr_nor_mtd *p = NULL; |
| 196 | unsigned int exp_timing_cs0; | 195 | unsigned int exp_timing_cs0; |