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/mmc | |
| 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/mmc')
| -rw-r--r-- | drivers/mmc/pxamci.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/wbsd.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c index d575e3a018bc..f31e247b2cbe 100644 --- a/drivers/mmc/pxamci.c +++ b/drivers/mmc/pxamci.c @@ -20,7 +20,7 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/ioport.h> -#include <linux/device.h> +#include <linux/platform_device.h> #include <linux/delay.h> #include <linux/interrupt.h> #include <linux/dma-mapping.h> diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c index 3ace875decc4..942668e93a74 100644 --- a/drivers/mmc/wbsd.c +++ b/drivers/mmc/wbsd.c @@ -26,7 +26,7 @@ #include <linux/moduleparam.h> #include <linux/init.h> #include <linux/ioport.h> -#include <linux/device.h> +#include <linux/platform_device.h> #include <linux/interrupt.h> #include <linux/dma-mapping.h> #include <linux/delay.h> |