Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-18 01:51:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

trivial: don't touch files that are removed in the staging tree

Browse Source 
This is a partial revert of e44ba033c5 ("treewide: remove duplicate
includes") and 28f65c11f2 ("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>
This commit is contained in:
Jiri Kosina 2011-07-20 11:59:21 +02:00
parent f996f20812
commit 9b42f06517
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/generic_serial/ser_a2232.c
View File

@ -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;

2
drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h
View File

@ -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

8
drivers/staging/westbridge/astoria/gadget/cyasgadget.h
View File

@ -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 */