Subject: ifdef typos mips: AU1[0X]00_USB_DEVICE

PATCH Applied [email protected] 1 participant 1 message Nov 30, 2004 MIPS

Share & tools

[email protected]

author

2004-11-30 02:38 UTC #0 lore raw

PATCH 9/11 Subject: ifdef typos mips: AU1[0X]00_USB_DEVICE

AU1000_USB_DEVICE appears 3 times.
AU1X00_USB_DEVICE appears 44 times, and is nowhere defined. One ifdef starts with "X" version, and ends with "0", so it's quite obvious these is supposed to be one option.

Makes you wonder if anybody uses these devices.

Signed-off-by Domen Puncer <[email protected]>

Acked-by Randy Dunlap <[email protected]>

Signed-off-by Maximilian Attems <[email protected]>

---

 linux-2.6.10-rc2-bk13-max/arch/mips/Kconfig                    |    2 +-
 linux-2.6.10-rc2-bk13-max/arch/mips/au1000/mtx-1/board_setup.c |    2 +-
 linux-2.6.10-rc2-bk13-max/arch/mips/configs/pb1500_defconfig   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

arch/mips/au1000/mtx-1/board_setup.c renamed from arch/mips/au1000/mtx-1/board_setup.c~ifdef-mips-au100_usb_device +1 -1

diff -puN arch/mips/au1000/mtx-1/board_setup.c~ifdef-mips-au100_usb_device arch/mips/au1000/mtx-1/board_setup.c
@@ -60,7 +60,7 @@ void __init board_setup(void)
 	// enable USB power switch
 	au_writel( au_readl(GPIO2_DIR) | 0x10, GPIO2_DIR );
 	au_writel( 0x100000, GPIO2_OUTPUT );
-#endif // defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1000_USB_DEVICE)
+#endif // defined (CONFIG_USB_OHCI) || defined (CONFIG_AU1X00_USB_DEVICE)
 
 #ifdef CONFIG_PCI
 #if defined(__MIPSEB__)

arch/mips/configs/pb1500_defconfig renamed from arch/mips/configs/pb1500_defconfig~ifdef-mips-au100_usb_device +1 -1

diff -puN arch/mips/configs/pb1500_defconfig~ifdef-mips-au100_usb_device arch/mips/configs/pb1500_defconfig
@@ -99,7 +99,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_HAVE_DEC_LOCK=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_CPU_LITTLE_ENDIAN=y
-# CONFIG_AU1000_USB_DEVICE is not set
+# CONFIG_AU1X00_USB_DEVICE is not set
 CONFIG_MIPS_L1_CACHE_SHIFT=5
 # CONFIG_FB is not set

arch/mips/Kconfig renamed from arch/mips/Kconfig~ifdef-mips-au100_usb_device +1 -1

diff -puN arch/mips/Kconfig~ifdef-mips-au100_usb_device arch/mips/Kconfig
@@ -959,7 +959,7 @@ config SYSCLK_100
 
 endchoice
 
-config AU1000_USB_DEVICE
+config AU1X00_USB_DEVICE
 	bool
 	depends on MIPS_PB1500 || MIPS_PB1100 || MIPS_PB1000
 	default n