aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/echo/echo.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-10 09:16:27 +0100
committerIngo Molnar <mingo@elte.hu>2008-11-10 09:16:27 +0100
commit4ecd33d930591d41fe356160593a9076467b961c (patch)
treeb9051a334540bbce38db1b2b03cebb4cf1d51f73 /drivers/staging/echo/echo.c
parentx86, NMI watchdog: disable NMIs on LVT0 in case NMI watchdog is not working (diff)
parentLinux 2.6.28-rc4 (diff)
downloadlinux-dev-4ecd33d930591d41fe356160593a9076467b961c.tar.xz
linux-dev-4ecd33d930591d41fe356160593a9076467b961c.zip
Merge commit 'v2.6.28-rc4' into x86/apic
Diffstat (limited to 'drivers/staging/echo/echo.c')
-rw-r--r--drivers/staging/echo/echo.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/echo/echo.c b/drivers/staging/echo/echo.c
index b8f2c5e9dee5..fd4007e329e7 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"