diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2018-06-06 18:31:54 +0800 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2018-06-06 18:35:23 +0800 |
| commit | 08488ff4e6e11d199e62c0046c8fd56b8ec3209b (patch) | |
| tree | e3cc2c6238799e86db01bca74db971e401eb8e00 | |
| parent | b857cd63e97e57c443f335dab0714ccfb3c7ca2b (diff) | |
| download | manifest-08488ff4e6e11d199e62c0046c8fd56b8ec3209b.tar.gz | |
x15.xml: use a fixed commit to work around the /dev/dri/card0 not found problem
The problem was introduced by a auto merge commit
http://git.ti.com/ti-linux-kernel/ti-linux-kernel/commit/fee2f7c652e05ea0c8a0e5a905d6fdf2b8f32148
Conflicts:
drivers/gpu/drm/omapdrm/dss/dss.c
drivers/usb/host/pci-quirks.h
Change-Id: Ie00eccf34d49358fde5cd72f987b592e4ef22628
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
| -rw-r--r-- | x15.xml | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -30,7 +30,10 @@ <project path="ti/u-boot" name="ti-u-boot/ti-u-boot.git" revision="ti-u-boot-2018.01" remote="git-ti-com" groups="device,ti" /> <!-- http://git.ti.com/cgit/cgit.cgi/android/kernel.git/log/?h=p-ti-android-linux-4.4.y --> <!-- http://git.ti.com/cgit/cgit.cgi/ti-linux-kernel/ti-linux-kernel.git/log/?h=ti-android-linux-4.14.y --> + <!-- <project path="kernel/ti/x15" name="ti-linux-kernel/ti-linux-kernel.git" revision="ti-android-linux-4.14.y" remote="git-ti-com" groups="device,ti" /> + --> + <project path="kernel/ti/x15" name="ti-linux-kernel/ti-linux-kernel.git" revision="9540b1b7a557a3ed95820809fd9304de154836a8" remote="git-ti-com" groups="device,ti" /> <!-- AOSP Forks --> <!-- |