diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 17:11:53 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 17:11:53 -0400 |
| commit | eb703027ac4ed563823e4d7824f68afed637d89a (patch) | |
| tree | de35552440e7d2c7b74d0020c6a3cc1a8ed8b060 /drivers/scsi/ppa.c | |
| parent | 429e90893c9ad2c266d541c94d6ca69a34a7701d (diff) | |
| parent | 837b41b5de356aa67abb2cadb5eef3efc7776f91 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/scsi/ppa.c')
| -rw-r--r-- | drivers/scsi/ppa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ppa.c b/drivers/scsi/ppa.c index f655ae320b48..8aa0bd987e29 100644 --- a/drivers/scsi/ppa.c +++ b/drivers/scsi/ppa.c | |||
| @@ -171,7 +171,7 @@ static int device_check(ppa_struct *dev); | |||
| 171 | 171 | ||
| 172 | #if PPA_DEBUG > 0 | 172 | #if PPA_DEBUG > 0 |
| 173 | #define ppa_fail(x,y) printk("ppa: ppa_fail(%i) from %s at line %d\n",\ | 173 | #define ppa_fail(x,y) printk("ppa: ppa_fail(%i) from %s at line %d\n",\ |
| 174 | y, __FUNCTION__, __LINE__); ppa_fail_func(x,y); | 174 | y, __func__, __LINE__); ppa_fail_func(x,y); |
| 175 | static inline void ppa_fail_func(ppa_struct *dev, int error_code) | 175 | static inline void ppa_fail_func(ppa_struct *dev, int error_code) |
| 176 | #else | 176 | #else |
| 177 | static inline void ppa_fail(ppa_struct *dev, int error_code) | 177 | static inline void ppa_fail(ppa_struct *dev, int error_code) |