Merge tag 'nios2-v3.20-rc1' of git://git.rocketboards.org/linux-socfpga-next

[karo-tx-linux.git] / lib / idr.c

diff --git a/lib/idr.c b/lib/idr.c
index 50be3fa9b657d95d786b02c70f507ab27807bbd3..5335c43adf46af55bb90717aa63afe33a6a30e9c 100644 (file)
--- a/lib/idr.c
+++ b/lib/idr.c
@@ -30,7 +30,6 @@
 #include <linux/idr.h>
 #include <linux/spinlock.h>
 #include <linux/percpu.h>
-#include <linux/hardirq.h>
 
 #define MAX_IDR_SHIFT          (sizeof(int) * 8 - 1)
 #define MAX_IDR_BIT            (1U << MAX_IDR_SHIFT)
@@ -626,7 +625,7 @@ static void __idr_remove_all(struct idr *idp)
  * idr_destroy().
  *
  * A typical clean-up sequence for objects stored in an idr tree will use
- * idr_for_each() to free all objects, if necessay, then idr_destroy() to
+ * idr_for_each() to free all objects, if necessary, then idr_destroy() to
  * free up the id mappings and cached idr_layers.
  */
 void idr_destroy(struct idr *idp)