diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-26 10:25:59 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-26 10:25:59 +0200 |
| commit | 3cf430b0636045dc524759a0852293ba037732a7 (patch) | |
| tree | 2c4e03f9028dc23ab4e6ca5a3a5a263af397984f /drivers/char/xilinx_hwicap/xilinx_hwicap.h | |
| parent | wait_task_inactive: "improve" the returned value for ->nvcsw == 0 (diff) | |
| parent | Fix oops in acer_wmi driver (acer_wmi_init) (diff) | |
| download | linux-3cf430b0636045dc524759a0852293ba037732a7.tar.xz linux-3cf430b0636045dc524759a0852293ba037732a7.zip | |
Merge branch 'linus' into sched/devel
Diffstat (limited to 'drivers/char/xilinx_hwicap/xilinx_hwicap.h')
| -rw-r--r-- | drivers/char/xilinx_hwicap/xilinx_hwicap.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.h b/drivers/char/xilinx_hwicap/xilinx_hwicap.h index 1f9c8b082dbe..24d0d9b938fb 100644 --- a/drivers/char/xilinx_hwicap/xilinx_hwicap.h +++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.h @@ -38,7 +38,6 @@ #include <linux/types.h> #include <linux/cdev.h> -#include <linux/version.h> #include <linux/platform_device.h> #include <asm/io.h> |