Changeset 6843a9c in mainline for uspace/srv/hw/bus/cuda_adb/cuda_adb.h

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Trivial conflicts.

File:

• uspace/srv/hw/bus/cuda_adb/cuda_adb.h (modified) (1 diff)

uspace/srv/hw/bus/cuda_adb/cuda_adb.h

@@ -111 +111 @@
         cuda_t *cuda;
         uintptr_t cuda_physical;
-        uintptr_t cuda_kernel;
 
         uint8_t rcv_buf[CUDA_RCV_BUF_SIZE];