[ARM] 4650/1: AT91: New-style init of I2C, support for i2c-gpio

[linux-2.6-omap-h63xx.git] / lib / textsearch.c

diff --git a/lib/textsearch.c b/lib/textsearch.c
index 1e934c196f0f1f8dbd7e69a2701f0ecc7ac1a1c7..88c98a2ec8d93efd79b230ca98feed8658f406a4 100644 (file)
--- a/lib/textsearch.c
+++ b/lib/textsearch.c
@@ -40,7 +40,7 @@
  *       configuration according to the specified parameters.
  *   (3) User starts the search(es) by calling _find() or _next() to
  *       fetch subsequent occurrences. A state variable is provided
- *       to the algorihtm to store persistant variables.
+ *       to the algorithm to store persistent variables.
  *   (4) Core eventually resets the search offset and forwards the find()
  *       request to the algorithm.
  *   (5) Algorithm calls get_next_block() provided by the user continously
@@ -93,7 +93,6 @@
  * ==========================================================================
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/string.h>
@@ -219,7 +218,7 @@ static unsigned int get_linear_data(unsigned int consumed, const u8 **dst,
  * Call textsearch_next() to retrieve subsequent matches.
  *
  * Returns the position of first occurrence of the pattern or
- * UINT_MAX if no occurrence was found.
+ * %UINT_MAX if no occurrence was found.
  */ 
 unsigned int textsearch_find_continuous(struct ts_config *conf,
                                        struct ts_state *state,
@@ -254,7 +253,7 @@ unsigned int textsearch_find_continuous(struct ts_config *conf,
  *         parameters or a ERR_PTR().
  */
 struct ts_config *textsearch_prepare(const char *algo, const void *pattern,
-                                    unsigned int len, int gfp_mask, int flags)
+                                    unsigned int len, gfp_t gfp_mask, int flags)
 {
        int err = -ENOENT;
        struct ts_config *conf;