summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2023-03-16 15:12:51 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2023-03-16 15:12:51 +0100
commit2d615bd09f629fda06b5c9006106915cd6783bcd (patch)
tree2d1782e33b817b5631aa3ac354978240ae29469d /fs
parent363e4d17ef42894dec44c7bbadbcef8fa02735f0 (diff)
parent58d7e12a8af61f26e04bb1c5933aa2d457774dcd (diff)
downloadbarebox-2d615bd09f629fda06b5c9006106915cd6783bcd.tar.gz
Merge branch 'for-next/arm' into next
Diffstat (limited to 'fs')
-rw-r--r--fs/omap4_usbbootfs.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/omap4_usbbootfs.c b/fs/omap4_usbbootfs.c
index 985d968cc5..30392d1192 100644
--- a/fs/omap4_usbbootfs.c
+++ b/fs/omap4_usbbootfs.c
@@ -17,7 +17,7 @@
#include <init.h>
#include <linux/stat.h>
#include <linux/err.h>
-#include <mach/omap4_rom_usb.h>
+#include <mach/omap/omap4_rom_usb.h>
#define OMAP4_USBBOOT_FS_MAGIC 0x5562464D
#define OMAP4_USBBOOT_FS_CMD_OPEN 0x46530000
@@ -143,8 +143,9 @@ static int omap4_usbbootfs_stat(struct device *dev, const char *filename,
static int omap4_usbbootfs_probe(struct device *dev)
{
- return 0;
+ return omap4_usbboot_open();
}
+
static void omap4_usbbootfs_remove(struct device *dev)
{
}