diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-05-11 05:18:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-05-11 05:18:24 -0700 |
| commit | cb7b2d168a2572566f7eb3815978de13720a9f88 (patch) | |
| tree | 661410328fd5b3e1e7f0ae8ffa715bbd6d6e3ad0 /include/linux | |
| parent | d26a9319172737e00840130ca3f97bd11997ab84 (diff) | |
| parent | 3e69f8b264bfad77efc49ca0e401dae51c08d66b (diff) | |
Merge http://lia64.bkbits.net/to-linus-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/efi.h | 16 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
2 files changed, 9 insertions, 8 deletions
diff --git a/include/linux/efi.h b/include/linux/efi.h index a627f2196ced..d07bc5ca6105 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -7,7 +7,7 @@ * * Copyright (C) 1999 VA Linux Systems * Copyright (C) 1999 Walt Drummond <drummond@valinux.com> - * Copyright (C) 1999, 2002 Hewlett-Packard Co. + * Copyright (C) 1999, 2002-2003 Hewlett-Packard Co. * David Mosberger-Tang <davidm@hpl.hp.com> * Stephane Eranian <eranian@hpl.hp.com> */ @@ -21,12 +21,12 @@ #include <asm/system.h> #define EFI_SUCCESS 0 -#define EFI_LOAD_ERROR (1L | (1L << 63)) -#define EFI_INVALID_PARAMETER (2L | (1L << 63)) -#define EFI_UNSUPPORTED (3L | (1L << 63)) -#define EFI_BAD_BUFFER_SIZE (4L | (1L << 63)) -#define EFI_BUFFER_TOO_SMALL (5L | (1L << 63)) -#define EFI_NOT_FOUND (14L | (1L << 63)) +#define EFI_LOAD_ERROR ( 1 | (1UL << 63)) +#define EFI_INVALID_PARAMETER ( 2 | (1UL << 63)) +#define EFI_UNSUPPORTED ( 3 | (1UL << 63)) +#define EFI_BAD_BUFFER_SIZE ( 4 | (1UL << 63)) +#define EFI_BUFFER_TOO_SMALL ( 5 | (1UL << 63)) +#define EFI_NOT_FOUND (14 | (1UL << 63)) typedef unsigned long efi_status_t; typedef u8 efi_bool_t; @@ -260,7 +260,7 @@ efi_guid_unparse(efi_guid_t *guid, char *out) extern void efi_init (void); extern void efi_map_pal_code (void); extern void efi_memmap_walk (efi_freemem_callback_t callback, void *arg); -extern void efi_gettimeofday (struct timeval *tv); +extern void efi_gettimeofday (struct timespec *ts); extern void efi_enter_virtual_mode (void); /* switch EFI to virtual mode, if possible */ extern u64 efi_get_iobase (void); extern u32 efi_mem_type (unsigned long phys_addr); diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 2880fb03e44a..996e9d1a9e3d 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -605,6 +605,7 @@ #define PCI_DEVICE_ID_HP_ZX1_SBA 0x1229 #define PCI_DEVICE_ID_HP_ZX1_IOC 0x122a #define PCI_DEVICE_ID_HP_ZX1_LBA 0x122e +#define PCI_DEVICE_ID_HP_SX1000_IOC 0x127c #define PCI_DEVICE_ID_HP_DIVA_EVEREST 0x1282 #define PCI_DEVICE_ID_HP_DIVA_AUX 0x1290 |