diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-19 02:38:23 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-19 02:38:23 -0500 |
| commit | 198d6ba4d7f48c94f990f4604f0b3d73925e0ded (patch) | |
| tree | 56bbdf8ba2553c23c8099da9344a8f1d1aba97ab /drivers/acpi/fan.c | |
| parent | 9a57f7fabd383920585ed8b74eacd117c6551f2d (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/isdn/i4l/isdn_net.c
fs/cifs/connect.c
Diffstat (limited to 'drivers/acpi/fan.c')
| -rw-r--r-- | drivers/acpi/fan.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c index 60d54d1f6b19..eaaee1660bdf 100644 --- a/drivers/acpi/fan.c +++ b/drivers/acpi/fan.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <acpi/acpi_bus.h> | 34 | #include <acpi/acpi_bus.h> |
| 35 | #include <acpi/acpi_drivers.h> | 35 | #include <acpi/acpi_drivers.h> |
| 36 | 36 | ||
| 37 | #define ACPI_FAN_COMPONENT 0x00200000 | ||
| 38 | #define ACPI_FAN_CLASS "fan" | 37 | #define ACPI_FAN_CLASS "fan" |
| 39 | #define ACPI_FAN_FILE_STATE "state" | 38 | #define ACPI_FAN_FILE_STATE "state" |
| 40 | 39 | ||