diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-22 23:21:57 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-22 23:21:57 (GMT) |
| commit | 1a6a35894f10870d5590199d1785d3a718927abe (patch) | |
| tree | ab3ab04b0ff2614ed7c322b31cbde9b6481addc1 /include/asm-arm/arch-ixp4xx/nas100d.h | |
| parent | 245599f573f302bfa27a0436408c80f13b457046 (diff) | |
| parent | 06e4479bd092eca4125e5507e7c22619a491dab3 (diff) | |
| download | linux-fsl-qoriq-1a6a35894f10870d5590199d1785d3a718927abe.tar.xz | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/arch-ixp4xx/nas100d.h')
| -rw-r--r-- | include/asm-arm/arch-ixp4xx/nas100d.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/arch-ixp4xx/nas100d.h b/include/asm-arm/arch-ixp4xx/nas100d.h index 51ac018..84467a5 100644 --- a/include/asm-arm/arch-ixp4xx/nas100d.h +++ b/include/asm-arm/arch-ixp4xx/nas100d.h @@ -19,8 +19,8 @@ #error "Do not include this directly, instead #include <asm/hardware.h>" #endif -#define NAS100D_SDA_PIN 6 -#define NAS100D_SCL_PIN 5 +#define NAS100D_SDA_PIN 5 +#define NAS100D_SCL_PIN 6 /* * NAS100D PCI IRQs |