diff options
author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:34 +0800 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:34 +0800 |
commit | 06c48e022c9737a840da15fd47c7df24dc5d5b9a (patch) | |
tree | b4dfddbb2c074254d747ba28b4fd9e1229082247 /Documentation/DocBook/Makefile | |
parent | 416f7ed72d4a115d473df16bab92b46c5d120ef1 (diff) | |
parent | 56bde254da35de0eea481035bfcd50dbec3ea22f (diff) |
Merge topic branch 'st-mems-sensors' into integration-linux-ux500
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
Diffstat (limited to 'Documentation/DocBook/Makefile')
-rw-r--r-- | Documentation/DocBook/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile index ae3d4c348c1..42d2b49983e 100644 --- a/Documentation/DocBook/Makefile +++ b/Documentation/DocBook/Makefile @@ -19,7 +19,8 @@ DOCBOOKS := z8530book.xml mcabook.xml device-drivers.xml \ tc_keypad.xml prcmu-fw-api.xml cg2900_fm_radio.xml \ synaptics_rmi4_touchp.xml db5500_keypad.xml \ u5500_LogicalMailbox.xml cg2900.xml \ - lsm303dlh.xml ske_keypad.xml ste_ff_vibra.xml ste_timed_vibra.xml ux500_usb.xml + lsm303dlh.xml ske_keypad.xml ste_ff_vibra.xml ste_timed_vibra.xml ux500_usb.xml \ + lps001wp_prs.xml include $(srctree)/Documentation/DocBook/media/Makefile |