diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-02-29 08:29:52 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-02-29 08:29:52 +0100 |
| commit | 8876de18545b8b0248d7c63897945c5c2940d789 (patch) | |
| tree | 894e25fc48b8d8a9c82655b23df0fdf6a0952850 /drivers | |
| parent | ff79f7a41c3f01af09479b33fe3825597c2f6a7f (diff) | |
| parent | 4bab39e7b6a7aebb4dfb49e7ece974ae5e8c940a (diff) | |
| download | barebox-8876de18545b8b0248d7c63897945c5c2940d789.tar.gz barebox-8876de18545b8b0248d7c63897945c5c2940d789.tar.xz | |
Merge branch 'pu/command' into next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/driver.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand_s3c24xx.c | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/u_serial.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/base/driver.c b/drivers/base/driver.c index 3777f82d64..a2674d607b 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c @@ -351,7 +351,7 @@ static int do_devinfo_subtree(struct device_d *dev, int depth) return 0; } -static int do_devinfo(struct command *cmdtp, int argc, char *argv[]) +static int do_devinfo(int argc, char *argv[]) { struct device_d *dev; struct driver_d *drv; diff --git a/drivers/mtd/nand/nand_s3c24xx.c b/drivers/mtd/nand/nand_s3c24xx.c index e55aef0335..dbf2e1420e 100644 --- a/drivers/mtd/nand/nand_s3c24xx.c +++ b/drivers/mtd/nand/nand_s3c24xx.c @@ -606,7 +606,7 @@ void __nand_boot_init s3c24x0_nand_load_image(void *dest, int size, int page) #ifdef CONFIG_NAND_S3C24XX_BOOT_DEBUG #include <command.h> -static int do_nand_boot_test(struct command *cmdtp, int argc, char *argv[]) +static int do_nand_boot_test(int argc, char *argv[]) { void *dest; int size; diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c index 980b527ff1..c5e7387d54 100644 --- a/drivers/usb/gadget/u_serial.c +++ b/drivers/usb/gadget/u_serial.c @@ -486,7 +486,7 @@ fail_out: } #include <command.h> -static int do_mycdev(struct command *cmdtp, int argc, char *argv[]) +static int do_mycdev(int argc, char *argv[]) { int i,j; |