diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-22 08:47:43 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-22 08:47:43 +0000 |
| commit | 4ab0fbd3a29067e1540f05093ae4ed07645d18c8 (patch) | |
| tree | 7f027e92e4578e293b20ac1f2c389600a795ea7f /init/main.c | |
| parent | f3c91c1deaf8493526d8216be94c33e963f00962 (diff) | |
| parent | 3561d43fd289f590fdae672e5eb831b8d5cf0bf6 (diff) | |
Merge remote branch 'linus' into drm-intel-fixes
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> |