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/megaraid/mega_common.h | |
| parent | 429e90893c9ad2c266d541c94d6ca69a34a7701d (diff) | |
| parent | 837b41b5de356aa67abb2cadb5eef3efc7776f91 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/scsi/megaraid/mega_common.h')
| -rw-r--r-- | drivers/scsi/megaraid/mega_common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/megaraid/mega_common.h b/drivers/scsi/megaraid/mega_common.h index f62ed468ada0..5ead1283a844 100644 --- a/drivers/scsi/megaraid/mega_common.h +++ b/drivers/scsi/megaraid/mega_common.h | |||
| @@ -265,7 +265,7 @@ typedef struct { | |||
| 265 | #define ASSERT(expression) \ | 265 | #define ASSERT(expression) \ |
| 266 | if (!(expression)) { \ | 266 | if (!(expression)) { \ |
| 267 | ASSERT_ACTION("assertion failed:(%s), file: %s, line: %d:%s\n", \ | 267 | ASSERT_ACTION("assertion failed:(%s), file: %s, line: %d:%s\n", \ |
| 268 | #expression, __FILE__, __LINE__, __FUNCTION__); \ | 268 | #expression, __FILE__, __LINE__, __func__); \ |
| 269 | } | 269 | } |
| 270 | #else | 270 | #else |
| 271 | #define ASSERT(expression) | 271 | #define ASSERT(expression) |