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-pxa/em-x270.c | |
| parent | f61fb8a52cdf8b9b6a6badde84aefe58cb35d315 (diff) | |
| parent | a4083c9271e0a697278e089f2c0b9a95363ada0a (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/arm/mach-pxa/em-x270.c')
| -rw-r--r-- | arch/arm/mach-pxa/em-x270.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c index 3d0ad5065ee5..3bb31314429a 100644 --- a/arch/arm/mach-pxa/em-x270.c +++ b/arch/arm/mach-pxa/em-x270.c | |||
| @@ -264,7 +264,7 @@ static int em_x270_mci_init(struct device *dev, | |||
| 264 | "MMC card detect", data); | 264 | "MMC card detect", data); |
| 265 | if (err) { | 265 | if (err) { |
| 266 | printk(KERN_ERR "%s: can't request MMC card detect IRQ: %d\n", | 266 | printk(KERN_ERR "%s: can't request MMC card detect IRQ: %d\n", |
| 267 | __FUNCTION__, err); | 267 | __func__, err); |
| 268 | return err; | 268 | return err; |
| 269 | } | 269 | } |
| 270 | 270 | ||