diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 14:38:55 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 14:38:55 -0500 |
commit | 328198acb7407301ddf6005c0fa1e04bd0c539c8 (patch) | |
tree | 9936112bd195bfbaacc9a75f2ea7ff757a2c0546 /drivers/video/acornfb.c | |
parent | 9e0cb06b17be7e562cbdaba2768649f025826dc6 (diff) | |
parent | fecb4a0c87c2bcaee1f3cf800126eef752a07ed3 (diff) | |
download | op-kernel-dev-328198acb7407301ddf6005c0fa1e04bd0c539c8.zip op-kernel-dev-328198acb7407301ddf6005c0fa1e04bd0c539c8.tar.gz |
Merge branch 'master'
Diffstat (limited to 'drivers/video/acornfb.c')
-rw-r--r-- | drivers/video/acornfb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c index f02965f..9b6a393 100644 --- a/drivers/video/acornfb.c +++ b/drivers/video/acornfb.c @@ -26,7 +26,7 @@ #include <linux/slab.h> #include <linux/init.h> #include <linux/fb.h> -#include <linux/device.h> +#include <linux/platform_device.h> #include <linux/dma-mapping.h> #include <asm/hardware.h> |