diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 16:32:56 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 16:32:56 +0100 |
| commit | 4fd5f8267dd37aaebadfabe71d9c808821eea05a (patch) | |
| tree | 50774592eaba942cf378fca731d307f901b737b7 /drivers/firmware | |
| parent | Input: adbhid - fix OOPS introduced by dynalloc conversion (diff) | |
| parent | [DRIVER MODEL] Add missing driver_unregister to IMX serial driver (diff) | |
| download | linux-4fd5f8267dd37aaebadfabe71d9c808821eea05a.tar.xz linux-4fd5f8267dd37aaebadfabe71d9c808821eea05a.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel
Manual #include fixups for clashes - there may be some unnecessary
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/dcdbas.c | 2 | ||||
| -rw-r--r-- | drivers/firmware/dell_rbu.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/dcdbas.c b/drivers/firmware/dcdbas.c index 955537fe9958..8ed6ddbb9c5d 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 4f4ba9b6d182..125929c9048f 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> |