diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-15 05:21:35 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-15 05:21:35 +0400 |
| commit | 2f093e2aa466d799c0952bfd1c6c68ff5d80fc17 (patch) | |
| tree | e3d511aca536b7123d256b98a0ef8e74fc219498 /drivers/s390/block/scm_drv.c | |
| parent | a7761027656dc192b59617a6eb961e38097419ce (diff) | |
| parent | 41ef2d5678d83af030125550329b6ae8b74618fa (diff) | |
| download | linux-2f093e2aa466d799c0952bfd1c6c68ff5d80fc17.tar.xz | |
Merge 3.9-rc7 into char-misc-next
We want the fixes in there.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/s390/block/scm_drv.c')
| -rw-r--r-- | drivers/s390/block/scm_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/block/scm_drv.c b/drivers/s390/block/scm_drv.c index 5f6180d6ff08..c98cf52d78d1 100644 --- a/drivers/s390/block/scm_drv.c +++ b/drivers/s390/block/scm_drv.c @@ -19,7 +19,7 @@ static void scm_notify(struct scm_device *scmdev, enum scm_event event) switch (event) { case SCM_CHANGE: - pr_info("%lu: The capabilities of the SCM increment changed\n", + pr_info("%lx: The capabilities of the SCM increment changed\n", (unsigned long) scmdev->address); SCM_LOG(2, "State changed"); SCM_LOG_STATE(2, scmdev); |