Skip to content

L
linux
Commit e506a238 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge bk://bk.arm.linux.org.uk/linux-2.5-pcmcia 

into home.osdl.org:/home/torvalds/v2.5/linux
parents a59a6ac5 534340a1
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
drivers/pcmcia/ti113x.h
View file @ e506a238
...@@ -325,9 +325,7 @@ static int ti113x_override(struct yenta_socket *socket) ...@@ -325,9 +325,7 @@ static int ti113x_override(struct yenta_socket *socket)
static int ti1250_init(struct pcmcia_socket *sock) static int ti1250_init(struct pcmcia_socket *sock)
{ {
struct yenta_socket *socket = container_of(sock, struct yenta_socket, socket); struct yenta_socket *socket = container_of(sock, struct yenta_socket, socket);
yenta_init(sock);
ti113x_init(sock); ti113x_init(sock);
ti_set_zv(sock);
ti_irqmux(socket) = config_readl(socket, TI122X_IRQMUX); ti_irqmux(socket) = config_readl(socket, TI122X_IRQMUX);
ti_irqmux(socket) = (ti_irqmux(socket) & ~0x0f) | 0x02; /* route INTA */ ti_irqmux(socket) = (ti_irqmux(socket) & ~0x0f) | 0x02; /* route INTA */
if (!(ti_sysctl(socket) & TI122X_SCR_INTRTIE)) if (!(ti_sysctl(socket) & TI122X_SCR_INTRTIE))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7