diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-07-08 15:07:46 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-07-08 15:07:46 +1000 |
| commit | 9f03493842b3ccea10bd467720cddb56f1042bf6 (patch) | |
| tree | 24dcd7b63f385378cff833566df1e720d921310b /kernel | |
| parent | cc9b74b58b0790d8b4aa433902fe60aef62514fe (diff) | |
| parent | 2db8616a214f9af0769720a3860b9bc4ac8c83c8 (diff) | |
Merge commit 'refs/next/20090703/ttydev'
Conflicts:
drivers/char/tty_ldisc.c
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/kfifo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/kfifo.c b/kernel/kfifo.c index 26539e3228e5..3765ff3c1bbe 100644 --- a/kernel/kfifo.c +++ b/kernel/kfifo.c @@ -117,7 +117,7 @@ EXPORT_SYMBOL(kfifo_free); * writer, you don't need extra locking to use these functions. */ unsigned int __kfifo_put(struct kfifo *fifo, - unsigned char *buffer, unsigned int len) + const unsigned char *buffer, unsigned int len) { unsigned int l; |