← Back to branch summary

~ubuntu-branches/ubuntu/raring/virtualbox-ose/raring

« back to all changes in this revision

Viewing changes to src/VBox/VMM/VMMR0/PDMR0Driver.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-01-30 23:27:25 UTC
  • mfrom: (0.3.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20110130232725-2ouajjd2ggdet0zd
Tags: 4.0.2-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Drop ubuntu-01-fix-build-gcc45.patch, fixed upstream.
* Drop ubuntu-02-as-needed.patch, added to the Debian package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/VMM/VMMR0/PDMR0Driver.cpp
1
 
/* $Id: PDMR0Driver.cpp $ */
 
1
/* $Id: PDMR0Driver.cpp 35346 2010-12-27 16:13:13Z vboxsync $ */
2
2
/** @file
3
3
 * PDM - Pluggable Device and Driver Manager, R0 Driver parts.
4
4
 */
20
20
*******************************************************************************/
21
21
#define LOG_GROUP LOG_GROUP_PDM_DRIVER
22
22
#include "PDMInternal.h"
23
 
#include <VBox/pdm.h>
24
 
#include <VBox/vm.h>
 
23
#include <VBox/vmm/pdm.h>
 
24
#include <VBox/vmm/vm.h>
25
25
 
26
26
#include <VBox/log.h>
27
27
#include <VBox/err.h>