Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...

[~andy/linux] / drivers / block / drbd / drbd_strings.c

diff --git a/drivers/block/drbd/drbd_strings.c b/drivers/block/drbd/drbd_strings.c
index 5b970adc3b6f55357c85ba4cd32b89e310aff42a..c44a2a6027724ddaf373664728bf6b2b592b68b7 100644 (file)
--- a/drivers/block/drbd/drbd_strings.c
+++ b/drivers/block/drbd/drbd_strings.c
@@ -107,7 +107,7 @@ const char *drbd_disk_str(enum drbd_disk_state s)
        return s > D_UP_TO_DATE    ? "TOO_LARGE" : drbd_disk_s_names[s];
 }
 
-const char *drbd_set_st_err_str(enum drbd_state_ret_codes err)
+const char *drbd_set_st_err_str(enum drbd_state_rv err)
 {
        return err <= SS_AFTER_LAST_ERROR ? "TOO_SMALL" :
               err > SS_TWO_PRIMARIES ? "TOO_LARGE"