diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-18 21:54:49 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-18 21:54:49 +0100 |
| commit | d110ec3a1e1f522e2e9dfceb9c36d6590c26d2d4 (patch) | |
| tree | 86b2f8f1d22b74b05239525c55bd42e3db6afc03 /drivers/staging/echo/echo.c | |
| parent | 343e9099c8152daff20e10d6269edec21da44fc0 (diff) | |
| parent | 55dac3a5553b13891f0ae4bbd11920619b5436d4 (diff) | |
Merge branch 'linus' into core/rcu
Diffstat (limited to 'drivers/staging/echo/echo.c')
| -rw-r--r-- | drivers/staging/echo/echo.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/echo/echo.c b/drivers/staging/echo/echo.c index b8f2c5e9dee..fd4007e329e 100644 --- a/drivers/staging/echo/echo.c +++ b/drivers/staging/echo/echo.c @@ -106,7 +106,6 @@ #include <linux/kernel.h> /* We're doing kernel work */ #include <linux/module.h> -#include <linux/kernel.h> #include <linux/slab.h> #include "bit_operations.h" |