diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-25 17:44:18 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-25 17:44:18 -0400 |
| commit | 54f53f2b94feb72622bec7a8563fc487d9f97720 (patch) | |
| tree | ab0c4e1dcadd25a00fa7a4febf41bc43b864cf73 /arch/arm/mach-ixp4xx/common-pci.c | |
| parent | f61fb8a52cdf8b9b6a6badde84aefe58cb35d315 (diff) | |
| parent | a4083c9271e0a697278e089f2c0b9a95363ada0a (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/arm/mach-ixp4xx/common-pci.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/common-pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp4xx/common-pci.c b/arch/arm/mach-ixp4xx/common-pci.c index bf04121d1a31..64be341109b3 100644 --- a/arch/arm/mach-ixp4xx/common-pci.c +++ b/arch/arm/mach-ixp4xx/common-pci.c | |||
| @@ -87,7 +87,7 @@ static inline int check_master_abort(void) | |||
| 87 | if (isr & PCI_ISR_PFE) { | 87 | if (isr & PCI_ISR_PFE) { |
| 88 | /* make sure the Master Abort bit is reset */ | 88 | /* make sure the Master Abort bit is reset */ |
| 89 | *PCI_ISR = PCI_ISR_PFE; | 89 | *PCI_ISR = PCI_ISR_PFE; |
| 90 | pr_debug("%s failed\n", __FUNCTION__); | 90 | pr_debug("%s failed\n", __func__); |
| 91 | return 1; | 91 | return 1; |
| 92 | } | 92 | } |
| 93 | 93 | ||