diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-12 23:06:37 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-12 23:14:09 -0700 |
| commit | c4c54da24b8ae12abb2034edaf08021894caf0d0 (patch) | |
| tree | 1b32092803e05b433f124785ae1eb59ca5bd4df2 /drivers/reset/Makefile | |
| parent | 06ff14c05426ec7b7600521c4e1ae19732797e15 (diff) | |
| parent | 6034bb22d8387708075c083385e5d2e1072a4f33 (diff) | |
| download | linux-stable-c4c54da24b8ae12abb2034edaf08021894caf0d0.tar.gz linux-stable-c4c54da24b8ae12abb2034edaf08021894caf0d0.tar.bz2 linux-stable-c4c54da24b8ae12abb2034edaf08021894caf0d0.zip | |
Merge branch 'reset/for_v3.10' of git://git.pengutronix.de/git/pza/linux into next/drivers
From Philipp Zabel, this is a series that adds a simple API for devices
to request being reset by a separate reset controller hardware, and
it implements reset signal device tree bindings.
* 'reset/for_v3.10' of git://git.pengutronix.de/git/pza/linux:
reset: NULL deref on allocation failure
reset: Add reset controller API
dt: describe base reset signal binding
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/reset/Makefile')
| -rw-r--r-- | drivers/reset/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/reset/Makefile b/drivers/reset/Makefile new file mode 100644 index 000000000000..1e2d83f2b995 --- /dev/null +++ b/drivers/reset/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_RESET_CONTROLLER) += core.o |