diff --git a/[refs] b/[refs] index 066436366578..f1fe291d8f31 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc3c26fe65ecaa3fa96844219a9070a3e079697a +refs/heads/master: 37679011c5a674eb80bff5c2b9b067bf16011d46 diff --git a/trunk/include/linux/jiffies.h b/trunk/include/linux/jiffies.h index e0b5b684d83f..8f4aa7280ca9 100644 --- a/trunk/include/linux/jiffies.h +++ b/trunk/include/linux/jiffies.h @@ -36,7 +36,7 @@ #elif HZ >= 6144 && HZ < 12288 # define SHIFT_HZ 13 #else -# error You lose. +# error Invalid value of HZ. #endif /* LATCH is used in the interval timer and ftape setup. */