diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-19 05:34:07 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-19 05:34:07 +0400 |
| commit | 2879a927bb7a3cf91ae3906a5e59215f9c17dd75 (patch) | |
| tree | 870bdd1bd530a3d5d2abd10539700446b2878188 /drivers/i2c/busses/i2c-pnx.c | |
| parent | 7e7b43892b87b6be259479ef4de14029dcb4012f (diff) | |
| parent | 20211e4d344729f4d4c93da37a590fc1c3a1fd9b (diff) | |
| download | linux-2879a927bb7a3cf91ae3906a5e59215f9c17dd75.tar.xz | |
Merge branch 'x86/oprofile' into oprofile
Diffstat (limited to 'drivers/i2c/busses/i2c-pnx.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-pnx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c index 1ca21084ffcf..ec15cff556b9 100644 --- a/drivers/i2c/busses/i2c-pnx.c +++ b/drivers/i2c/busses/i2c-pnx.c @@ -19,7 +19,7 @@ #include <linux/completion.h> #include <linux/platform_device.h> #include <linux/i2c-pnx.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/irq.h> #include <asm/uaccess.h> |