diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-16 22:58:08 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-16 22:58:58 -0500 |
| commit | 5046e385b4426e229a6beb4bce480762af91a6fc (patch) | |
| tree | 65b4bff2c913a18840b3c58892853d51b942ac43 /drivers/edac/octeon_edac-pci.c | |
| parent | a73b59c51ab288d81b515b504790267f594884b8 (diff) | |
| parent | b86dc0d8c12bbb9fed3f392c284bdc7114ce00c1 (diff) | |
Merge branch 'v3.8-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
From Kukjin Kim:
That branch fixes build error for S3C24XX/S3C64xx. And corrects dw-mshc
properties on EXYNOS5 DT and fixes IRQ mapping on Cragganmore board.
* 'v3.8-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: S3C64XX: Fix up IRQ mapping for balblair on Cragganmore
ARM: dts: correct the dw-mshc timing properties as per binding
ARM: S3C64XX: Fix build error with CONFIG_S3C_DEV_FB disabled
+ Linux 3.8-rc3
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/edac/octeon_edac-pci.c')
| -rw-r--r-- | drivers/edac/octeon_edac-pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/edac/octeon_edac-pci.c b/drivers/edac/octeon_edac-pci.c index 758c1ef5fc9e..9ca73cec74e7 100644 --- a/drivers/edac/octeon_edac-pci.c +++ b/drivers/edac/octeon_edac-pci.c | |||
| @@ -58,7 +58,7 @@ static void octeon_pci_poll(struct edac_pci_ctl_info *pci) | |||
| 58 | } | 58 | } |
| 59 | } | 59 | } |
| 60 | 60 | ||
| 61 | static int __devinit octeon_pci_probe(struct platform_device *pdev) | 61 | static int octeon_pci_probe(struct platform_device *pdev) |
| 62 | { | 62 | { |
| 63 | struct edac_pci_ctl_info *pci; | 63 | struct edac_pci_ctl_info *pci; |
| 64 | int res = 0; | 64 | int res = 0; |