diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
| commit | 51c24aaacaea90c8e87f1dec75a2ac7622b593f8 (patch) | |
| tree | 9f54936c87764bef75e97395cb56b7d1e0df24c6 /drivers/input/mouse/lifebook.c | |
| parent | 4276e47e2d1c85a2477caf0d22b91c4f2377fba8 (diff) | |
| parent | 6be325719b3e54624397e413efd4b33a997e55a3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/input/mouse/lifebook.c')
| -rw-r--r-- | drivers/input/mouse/lifebook.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/input/mouse/lifebook.c b/drivers/input/mouse/lifebook.c index 2e6bdfea0165..6d7aa10d10f0 100644 --- a/drivers/input/mouse/lifebook.c +++ b/drivers/input/mouse/lifebook.c | |||
| @@ -44,7 +44,6 @@ static int lifebook_set_6byte_proto(const struct dmi_system_id *d) | |||
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | static const struct dmi_system_id __initconst lifebook_dmi_table[] = { | 46 | static const struct dmi_system_id __initconst lifebook_dmi_table[] = { |
| 47 | #if defined(CONFIG_DMI) && defined(CONFIG_X86) | ||
| 48 | { | 47 | { |
| 49 | /* FLORA-ie 55mi */ | 48 | /* FLORA-ie 55mi */ |
| 50 | .matches = { | 49 | .matches = { |
| @@ -118,7 +117,6 @@ static const struct dmi_system_id __initconst lifebook_dmi_table[] = { | |||
| 118 | }, | 117 | }, |
| 119 | }, | 118 | }, |
| 120 | { } | 119 | { } |
| 121 | #endif | ||
| 122 | }; | 120 | }; |
| 123 | 121 | ||
| 124 | void __init lifebook_module_init(void) | 122 | void __init lifebook_module_init(void) |