diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:35:40 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:35:40 +0200 |
| commit | 429b022af41108f6942d72547592b1d30e9a51f0 (patch) | |
| tree | 7d68355529718018cdad1241285816c6f64620b2 /drivers/input/keyboard/bf54x-keys.c | |
| parent | 0cd418ddb1ee88df7d16d5df06cb2da68eceb9e4 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
| download | blackbird-op-linux-429b022af41108f6942d72547592b1d30e9a51f0.tar.gz blackbird-op-linux-429b022af41108f6942d72547592b1d30e9a51f0.zip | |
Merge commit 'v2.6.27-rc6' into core/rcu
Diffstat (limited to 'drivers/input/keyboard/bf54x-keys.c')
| -rw-r--r-- | drivers/input/keyboard/bf54x-keys.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/keyboard/bf54x-keys.c b/drivers/input/keyboard/bf54x-keys.c index 54ed8e2e1c02..e348cfccc17a 100644 --- a/drivers/input/keyboard/bf54x-keys.c +++ b/drivers/input/keyboard/bf54x-keys.c @@ -29,7 +29,6 @@ */ #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> #include <linux/fs.h> @@ -44,7 +43,7 @@ #include <linux/input.h> #include <asm/portmux.h> -#include <asm/mach/bf54x_keys.h> +#include <mach/bf54x_keys.h> #define DRV_NAME "bf54x-keys" #define TIME_SCALE 100 /* 100 ns */ |
