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/gpu/drm/i915/i915_drv.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/gpu/drm/i915/i915_drv.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 530db83ef320..117265840b1f 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c | |||
| @@ -877,8 +877,7 @@ int i915_reset(struct drm_device *dev) | |||
| 877 | return 0; | 877 | return 0; |
| 878 | } | 878 | } |
| 879 | 879 | ||
| 880 | static int __devinit | 880 | static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) |
| 881 | i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | ||
| 882 | { | 881 | { |
| 883 | struct intel_device_info *intel_info = | 882 | struct intel_device_info *intel_info = |
| 884 | (struct intel_device_info *) ent->driver_data; | 883 | (struct intel_device_info *) ent->driver_data; |