diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-19 09:04:25 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-19 09:04:25 +0100 |
| commit | fe040be2fdc49a4132c5f64359c629aeeb8e4947 (patch) | |
| tree | 40323a8f05d3754372f561bb8f4698ef1a4e9c8f /init/main.c | |
| parent | fbdev: modedb: fix CEA modes (diff) | |
| parent | fbdev: sh_mipi_dsi: Allow LCDC board callbacks (diff) | |
| download | linux-fe040be2fdc49a4132c5f64359c629aeeb8e4947.tar.xz linux-fe040be2fdc49a4132c5f64359c629aeeb8e4947.zip | |
Merge branch 'common/fbdev-mipi' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
Diffstat (limited to 'init/main.c')
| -rw-r--r-- | init/main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index e59af24a0b7c..8646401f7a0e 100644 --- a/init/main.c +++ b/init/main.c @@ -20,7 +20,6 @@ #include <linux/delay.h> #include <linux/ioport.h> #include <linux/init.h> -#include <linux/smp_lock.h> #include <linux/initrd.h> #include <linux/bootmem.h> #include <linux/acpi.h> |