diff options
| author | David S. Miller <davem@kernel.bkbits.net> | 2003-07-13 05:37:15 -0700 |
|---|---|---|
| committer | David S. Miller <davem@kernel.bkbits.net> | 2003-07-13 05:37:15 -0700 |
| commit | 112f7aa92a1c50715b1e153e10de8bbb9da3a1d4 (patch) | |
| tree | 7049d08f0c86a7193dde46016638105012540a61 /include | |
| parent | 5aecc16efb10b8c3859a52eb27062b2fbf6fa5b9 (diff) | |
| parent | 8916e8f1f4b9b6972a6260e7c36f2451fcf6a1fc (diff) | |
Merge davem@nuts.ninka.net:/home/davem/src/BK/net-2.5
into kernel.bkbits.net:/home/davem/net-2.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-alpha/timex.h | 4 | ||||
| -rw-r--r-- | include/asm-alpha/unistd.h | 3 | ||||
| -rw-r--r-- | include/pcmcia/ss.h | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/include/asm-alpha/timex.h b/include/asm-alpha/timex.h index 2576553b348e..f3737a1ee698 100644 --- a/include/asm-alpha/timex.h +++ b/include/asm-alpha/timex.h @@ -6,7 +6,9 @@ #ifndef _ASMALPHA_TIMEX_H #define _ASMALPHA_TIMEX_H -#define CLOCK_TICK_RATE 1193180 /* Underlying HZ */ +/* With only one or two oddballs, we use the RTC as the ticker, selecting + the 32.768kHz reference clock, which nicely divides down to our HZ. */ +#define CLOCK_TICK_RATE 32768 /* * Standard way to access the cycle counter. diff --git a/include/asm-alpha/unistd.h b/include/asm-alpha/unistd.h index 38faced4d0a2..3035b700f454 100644 --- a/include/asm-alpha/unistd.h +++ b/include/asm-alpha/unistd.h @@ -359,7 +359,8 @@ #define __NR_clock_getres 421 #define __NR_clock_nanosleep 422 #define __NR_semtimedop 423 -#define NR_SYSCALLS 424 +#define __NR_tgkill 424 +#define NR_SYSCALLS 425 #if defined(__GNUC__) diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h index c0891855a0b1..24cb380be518 100644 --- a/include/pcmcia/ss.h +++ b/include/pcmcia/ss.h @@ -170,7 +170,6 @@ struct region_t; struct pcmcia_socket { struct module *owner; spinlock_t lock; - struct pccard_operations * ss_entry; socket_state_t socket; u_int state; u_short functions; @@ -207,6 +206,9 @@ struct pcmcia_socket { u_char pci_irq; struct pci_dev * cb_dev; + /* socket operations */ + struct pccard_operations * ops; + /* state thread */ struct semaphore skt_sem; /* protects socket h/w state */ |