diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/char/bsr.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/char/bsr.c')
| -rw-r--r-- | drivers/char/bsr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/bsr.c b/drivers/char/bsr.c index 91917133ae0a..cf39bc08ce08 100644 --- a/drivers/char/bsr.c +++ b/drivers/char/bsr.c | |||
| @@ -155,6 +155,7 @@ static const struct file_operations bsr_fops = { | |||
| 155 | .owner = THIS_MODULE, | 155 | .owner = THIS_MODULE, |
| 156 | .mmap = bsr_mmap, | 156 | .mmap = bsr_mmap, |
| 157 | .open = bsr_open, | 157 | .open = bsr_open, |
| 158 | .llseek = noop_llseek, | ||
| 158 | }; | 159 | }; |
| 159 | 160 | ||
| 160 | static void bsr_cleanup_devs(void) | 161 | static void bsr_cleanup_devs(void) |
| @@ -294,7 +295,7 @@ static int bsr_create_devs(struct device_node *bn) | |||
| 294 | static int __init bsr_init(void) | 295 | static int __init bsr_init(void) |
| 295 | { | 296 | { |
| 296 | struct device_node *np; | 297 | struct device_node *np; |
| 297 | dev_t bsr_dev = MKDEV(bsr_major, 0); | 298 | dev_t bsr_dev; |
| 298 | int ret = -ENODEV; | 299 | int ret = -ENODEV; |
| 299 | int result; | 300 | int result; |
| 300 | 301 | ||