diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-02-01 17:25:59 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-02-01 17:25:59 +0100 |
| commit | 6cbf70a01a0d40280acc2eb32508327d00317476 (patch) | |
| tree | 316581a993ea6e9b7b581290c5feb61c9cbf3eb2 /drivers | |
| parent | e4ee34a829a00e058828f3daade04f4141ea3ef9 (diff) | |
| parent | 7d3da14a7e187d05ee42fb7e628fb4091207b5e3 (diff) | |
| download | barebox-6cbf70a01a0d40280acc2eb32508327d00317476.tar.gz barebox-6cbf70a01a0d40280acc2eb32508327d00317476.tar.xz | |
Merge branch 'pu'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/nand/nand_imx.c | 2 | ||||
| -rw-r--r-- | drivers/nand/nand_s3c2410.c | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/u_serial.c | 2 | ||||
| -rw-r--r-- | drivers/usb/usb.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/nand/nand_imx.c b/drivers/nand/nand_imx.c index 831ba628df..bd5ec10a27 100644 --- a/drivers/nand/nand_imx.c +++ b/drivers/nand/nand_imx.c @@ -1149,7 +1149,7 @@ void __nand_boot_init imx_nand_load_image(void *dest, int size) #ifdef CONFIG_NAND_IMX_BOOT_DEBUG #include <command.h> -static int do_nand_boot_test(cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_nand_boot_test(struct command *cmdtp, int argc, char *argv[]) { void *dest; int size; diff --git a/drivers/nand/nand_s3c2410.c b/drivers/nand/nand_s3c2410.c index 2f98c76221..b989583050 100644 --- a/drivers/nand/nand_s3c2410.c +++ b/drivers/nand/nand_s3c2410.c @@ -484,7 +484,7 @@ void __nand_boot_init s3c24x0_nand_load_image(void *dest, int size, int page, in #ifdef CONFIG_NAND_S3C24XX_BOOT_DEBUG #include <command.h> -static int do_nand_boot_test(cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_nand_boot_test(struct command *cmdtp, int argc, char *argv[]) { void *dest; int size, pagesize; diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c index d3b49edafa..cb65b19980 100644 --- a/drivers/usb/gadget/u_serial.c +++ b/drivers/usb/gadget/u_serial.c @@ -470,7 +470,7 @@ fail_out: } #include <command.h> -static int do_mycdev (cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_mycdev(struct command *cmdtp, int argc, char *argv[]) { int i,j; diff --git a/drivers/usb/usb.c b/drivers/usb/usb.c index decdbdd8e7..1ad4babb88 100644 --- a/drivers/usb/usb.c +++ b/drivers/usb/usb.c @@ -478,7 +478,7 @@ static int __usb_init(void) return 0; } -static int do_usb(cmd_tbl_t *cmdtp, int argc, char *argv[]) +static int do_usb(struct command *cmdtp, int argc, char *argv[]) { __usb_init(); |