diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /include/linux/efi.h | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'include/linux/efi.h')
| -rw-r--r-- | include/linux/efi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/efi.h b/include/linux/efi.h index bb66feb164bd..ce4581fbc08b 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h | |||
| @@ -101,7 +101,7 @@ typedef struct { | |||
| 101 | u64 attribute; | 101 | u64 attribute; |
| 102 | } efi_memory_desc_t; | 102 | } efi_memory_desc_t; |
| 103 | 103 | ||
| 104 | typedef int (*efi_freemem_callback_t) (unsigned long start, unsigned long end, void *arg); | 104 | typedef int (*efi_freemem_callback_t) (u64 start, u64 end, void *arg); |
| 105 | 105 | ||
| 106 | /* | 106 | /* |
| 107 | * Types and defines for Time Services | 107 | * Types and defines for Time Services |