diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 15:39:24 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 15:39:24 -0500 |
| commit | 7211bb9b64f17b23834d91fc3d0c1d78671ee9a8 (patch) | |
| tree | 541909f86c31fee97cd70d28ec2fe5c23e1ceb02 /drivers/firmware | |
| parent | f1e691a24955ea987f021f378324fb5003b1b208 (diff) | |
| parent | 70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/Kconfig | 3 | ||||
| -rw-r--r-- | drivers/firmware/dcdbas.c | 2 | ||||
| -rw-r--r-- | drivers/firmware/dell_rbu.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 327b58e6487..b6815c6c29a 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -70,8 +70,7 @@ config DELL_RBU config DCDBAS tristate "Dell Systems Management Base Driver" - depends on X86 || X86_64 - default m + depends on X86 help The Dell Systems Management Base Driver provides a sysfs interface for systems management software to perform System Management diff --git a/drivers/firmware/dcdbas.c b/drivers/firmware/dcdbas.c index 955537fe995..8ed6ddbb9c5 100644 --- a/drivers/firmware/dcdbas.c +++ b/drivers/firmware/dcdbas.c @@ -20,7 +20,7 @@ * GNU General Public License for more details. */ -#include <linux/device.h> +#include <linux/platform_device.h> #include <linux/dma-mapping.h> #include <linux/errno.h> #include <linux/init.h> diff --git a/drivers/firmware/dell_rbu.c b/drivers/firmware/dell_rbu.c index 4f4ba9b6d18..125929c9048 100644 --- a/drivers/firmware/dell_rbu.c +++ b/drivers/firmware/dell_rbu.c @@ -41,7 +41,7 @@ #include <linux/string.h> #include <linux/errno.h> #include <linux/blkdev.h> -#include <linux/device.h> +#include <linux/platform_device.h> #include <linux/spinlock.h> #include <linux/moduleparam.h> #include <linux/firmware.h> |