diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-04-06 20:55:10 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-04-06 20:55:10 +0200 |
| commit | eec2e9b2433983c775a692295a3c06799a9811d4 (patch) | |
| tree | 2042b2fbd5a6b4a3230d5f5db3575d3822309228 /common | |
| parent | d37201edc188364e9bb1d2e747de6c7fe1af8aaf (diff) | |
| parent | 46e7bfbac6fa7d674e0536e012a2cb6af16abd34 (diff) | |
| download | barebox-eec2e9b2433983c775a692295a3c06799a9811d4.tar.gz barebox-eec2e9b2433983c775a692295a3c06799a9811d4.tar.xz | |
Merge branch 'for-next/fs'
Diffstat (limited to 'common')
| -rw-r--r-- | common/block.c | 2 | ||||
| -rw-r--r-- | common/firmware.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/common/block.c b/common/block.c index e2ba9d4296..55d8d1637e 100644 --- a/common/block.c +++ b/common/block.c @@ -332,7 +332,7 @@ static int block_op_flush(struct cdev *cdev) return writebuffer_flush(blk); } -static struct file_operations block_ops = { +static struct cdev_operations block_ops = { .read = block_op_read, #ifdef CONFIG_BLOCK_WRITE .write = block_op_write, diff --git a/common/firmware.c b/common/firmware.c index 664f9107d0..250fef5378 100644 --- a/common/firmware.c +++ b/common/firmware.c @@ -153,7 +153,7 @@ static int firmware_close(struct cdev *cdev) return 0; } -static struct file_operations firmware_ops = { +static struct cdev_operations firmware_ops = { .open = firmware_open, .write = firmware_write, .close = firmware_close, |