diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-05-10 09:32:46 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-05-10 09:32:46 -0400 |
| commit | 0ae28a35bcb7984838acbf28bfba9c030f8b74f0 (patch) | |
| tree | 4f449d929b5df9e126e839f388ff0fd2b52028a0 /drivers/sbus | |
| parent | 6f1f3d0ab5c3eeea9f04486481c25e9afdfa26c5 (diff) | |
| parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/mtdcore.c
Pull in the bdi fixes and ARM platform changes that other outstanding
patches depend on.
Diffstat (limited to 'drivers/sbus')
| -rw-r--r-- | drivers/sbus/char/bbc_envctrl.c | 1 | ||||
| -rw-r--r-- | drivers/sbus/char/display7seg.c | 1 | ||||
| -rw-r--r-- | drivers/sbus/char/envctrl.c | 1 | ||||
| -rw-r--r-- | drivers/sbus/char/flash.c | 1 | ||||
| -rw-r--r-- | drivers/sbus/char/jsflash.c | 1 |
5 files changed, 3 insertions, 2 deletions
diff --git a/drivers/sbus/char/bbc_envctrl.c b/drivers/sbus/char/bbc_envctrl.c index 28d86f9df83c..b4951eb0358e 100644 --- a/drivers/sbus/char/bbc_envctrl.c +++ b/drivers/sbus/char/bbc_envctrl.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | #include <linux/kmod.h> | 8 | #include <linux/kmod.h> |
| 9 | #include <linux/reboot.h> | 9 | #include <linux/reboot.h> |
| 10 | #include <linux/of.h> | 10 | #include <linux/of.h> |
| 11 | #include <linux/slab.h> | ||
| 11 | #include <linux/of_device.h> | 12 | #include <linux/of_device.h> |
| 12 | #include <asm/oplib.h> | 13 | #include <asm/oplib.h> |
| 13 | 14 | ||
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c index 4431578d8c45..3e59189f4137 100644 --- a/drivers/sbus/char/display7seg.c +++ b/drivers/sbus/char/display7seg.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/miscdevice.h> | 13 | #include <linux/miscdevice.h> |
| 14 | #include <linux/ioport.h> /* request_region */ | 14 | #include <linux/ioport.h> /* request_region */ |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/smp_lock.h> | 16 | #include <linux/smp_lock.h> |
| 16 | #include <linux/of.h> | 17 | #include <linux/of.h> |
| 17 | #include <linux/of_device.h> | 18 | #include <linux/of_device.h> |
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c index aa2b60a868ba..c6e2eff19409 100644 --- a/drivers/sbus/char/envctrl.c +++ b/drivers/sbus/char/envctrl.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/miscdevice.h> | 26 | #include <linux/miscdevice.h> |
| 27 | #include <linux/kmod.h> | 27 | #include <linux/kmod.h> |
| 28 | #include <linux/reboot.h> | 28 | #include <linux/reboot.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/smp_lock.h> | 30 | #include <linux/smp_lock.h> |
| 30 | #include <linux/of.h> | 31 | #include <linux/of.h> |
| 31 | #include <linux/of_device.h> | 32 | #include <linux/of_device.h> |
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c index 41083472ff4f..19f255b97c86 100644 --- a/drivers/sbus/char/flash.c +++ b/drivers/sbus/char/flash.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #include <linux/types.h> | 7 | #include <linux/types.h> |
| 8 | #include <linux/errno.h> | 8 | #include <linux/errno.h> |
| 9 | #include <linux/miscdevice.h> | 9 | #include <linux/miscdevice.h> |
| 10 | #include <linux/slab.h> | ||
| 11 | #include <linux/fcntl.h> | 10 | #include <linux/fcntl.h> |
| 12 | #include <linux/poll.h> | 11 | #include <linux/poll.h> |
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c index 869a30b49edc..4942050dc5b6 100644 --- a/drivers/sbus/char/jsflash.c +++ b/drivers/sbus/char/jsflash.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | #include <linux/types.h> | 31 | #include <linux/types.h> |
| 32 | #include <linux/errno.h> | 32 | #include <linux/errno.h> |
| 33 | #include <linux/miscdevice.h> | 33 | #include <linux/miscdevice.h> |
| 34 | #include <linux/slab.h> | ||
| 35 | #include <linux/fcntl.h> | 34 | #include <linux/fcntl.h> |
| 36 | #include <linux/poll.h> | 35 | #include <linux/poll.h> |
| 37 | #include <linux/init.h> | 36 | #include <linux/init.h> |