Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 258876
b: refs/heads/master
c: 9b42f06
h: refs/heads/master
v: v3
  • Loading branch information
Jiri Kosina committed Jul 20, 2011
1 parent 055ffd4 commit 7043e4a
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f996f2081276c37da4dbd7b2e6310fbc8f0034f6
refs/heads/master: 9b42f06517ae19d6519e9c54eac5ea58d00f3028
3 changes: 1 addition & 2 deletions trunk/drivers/staging/generic_serial/ser_a2232.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 6 additions & 2 deletions trunk/drivers/staging/westbridge/astoria/gadget/cyasgadget.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 7043e4a

Please sign in to comment.