diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-07-20 11:59:21 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-07-20 11:59:21 +0200 |
| commit | 9b42f06517ae19d6519e9c54eac5ea58d00f3028 (patch) | |
| tree | 3d81cf89b8df0d065ff73524012339c87f0371a6 /drivers | |
| parent | f996f2081276c37da4dbd7b2e6310fbc8f0034f6 (diff) | |
trivial: don't touch files that are removed in the staging tree
This is a partial revert of e44ba033c565 ("treewide: remove duplicate
includes") and 28f65c11f2ff ("treewide: Convert uses of struct resource
to resource_size(ptr)") as the files in question have been removed in
staging tree, so get rid of the conflict.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers')
3 files changed, 8 insertions, 5 deletions
diff --git a/drivers/staging/generic_serial/ser_a2232.c b/drivers/staging/generic_serial/ser_a2232.c index 0c08e1c2558..3f47c2ead8e 100644 --- a/drivers/staging/generic_serial/ser_a2232.c +++ b/drivers/staging/generic_serial/ser_a2232.c @@ -746,8 +746,7 @@ static int __init a2232board_init(void) zd_a2232[nr_a2232] = z; boardaddr = ZTWO_VADDR( z->resource.start ); - printk("Board is located at address 0x%x, size is 0x%x\n", - boardaddr, (unsigned int)resource_size(&z->resource)); + printk("Board is located at address 0x%x, size is 0x%x.\n", boardaddr, (unsigned int) ((z->resource.end+1) - (z->resource.start))); mem = (volatile struct a2232memory *) boardaddr; diff --git a/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h b/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h index 1e9212fbf1a..6426ea61f3d 100644 --- a/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h +++ b/drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h @@ -315,5 +315,5 @@ void cy_as_hal_set_ep_dma_mode(uint8_t ep, bool sg_xfer_enabled); /* moved to staging location #include <linux/westbridge/cyas_cplus_end.h> */ -#include "../../../../../../../include/linux/westbridge/cyas_cplus_end.h" +#include "../../../../../../../include/linux/westbridge/cyas_cplus_start.h" #endif diff --git a/drivers/staging/westbridge/astoria/gadget/cyasgadget.h b/drivers/staging/westbridge/astoria/gadget/cyasgadget.h index 668e03f9e8a..e01cea7eeb7 100644 --- a/drivers/staging/westbridge/astoria/gadget/cyasgadget.h +++ b/drivers/staging/westbridge/astoria/gadget/cyasgadget.h @@ -54,15 +54,19 @@ #include <linux/usb/ch9.h> #include <linux/usb/gadget.h> #include <linux/sched.h> -#include <linux/module.h> -#include <linux/init.h> #include "../include/linux/westbridge/cyastoria.h" #include "../include/linux/westbridge/cyashal.h" #include "../include/linux/westbridge/cyasdevice.h" #include "cyasgadget_ioctl.h" +#include <linux/module.h> +#include <linux/init.h> + /*char driver defines, revisit*/ +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/init.h> #include <linux/fs.h> /* everything... */ #include <linux/errno.h> /* error codes */ #include <linux/types.h> /* size_t */ |